ffmpeg/libavcodec
Michael Niedermayer 8772156be0 Merge remote branch 'qatar/master'
* qatar/master:
  APIChanges: document git revision for CODEC_CAP_SLICE_THREADS addition.
  Introduce slice threads flag.
  FATE: allow forcing thread-type when doing threaded fate runs.
  Use av_log_ask_for_sample() where appropriate.
  error: sort, pack, and align error code and string definitions
  The stabilization period after version bumps should be one month, not one week.
  applehttp: Expose the stream bitrate via metadata
  doc: Add some initial docs on the applehttp demuxer
  Provide a fallback version of the libm function trunc
  libavdevice: Define _XOPEN_SOURCE for usleep
  lavc: provide deprecated avcodec_thread_init until next major version
  lavc: provide the opt.h header until the next bump
  error: change AVERROR_EOF value
  error: remove AVERROR_NUMEXPECTED
  error: add error code AVERROR_OPTION_NOT_FOUND, and use it in opt.c

Conflicts:
	libavcodec/h264.c
	libavutil/error.c
	libavutil/error.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-22 03:54:30 +02:00
..
2011-04-19 10:16:07 +02:00
2011-04-13 02:49:22 +02:00
2011-04-12 17:40:18 +02:00
2011-04-17 23:43:54 +02:00
2011-04-05 02:31:56 +02:00
2011-04-13 02:49:22 +02:00
2011-04-17 23:43:54 +02:00
2011-04-17 23:43:54 +02:00
2011-04-05 02:31:56 +02:00
2011-04-05 02:31:56 +02:00
2011-03-28 00:16:44 +02:00
2011-03-28 00:16:44 +02:00
2011-04-11 23:39:12 +02:00
2011-04-22 03:54:30 +02:00
2011-04-17 23:43:54 +02:00
2011-04-17 23:43:54 +02:00
2011-04-22 03:54:30 +02:00
2011-04-22 03:54:30 +02:00
2011-04-02 18:19:01 +02:00
2011-04-02 19:26:58 +02:00
2011-04-20 04:48:23 +02:00
2011-04-22 03:54:30 +02:00
2011-04-02 01:54:27 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-22 03:54:30 +02:00
2011-04-20 04:48:23 +02:00
2011-04-13 02:49:22 +02:00
2011-04-03 02:28:01 +02:00
2011-04-03 02:28:01 +02:00
2011-04-22 03:54:30 +02:00
2011-04-03 02:28:01 +02:00
2011-04-17 23:43:54 +02:00
2011-04-19 13:25:05 +02:00
2011-04-12 03:54:28 +02:00
2011-04-22 03:54:30 +02:00
2011-04-22 03:54:30 +02:00
2011-04-22 03:54:30 +02:00
2011-04-14 03:21:38 +02:00
2011-04-17 23:43:54 +02:00
2011-04-17 23:43:54 +02:00
2011-04-20 04:48:23 +02:00
2011-04-20 04:48:23 +02:00
2011-04-20 04:48:23 +02:00
2011-04-06 02:59:49 +02:00
2011-04-22 03:54:30 +02:00
2011-04-17 23:43:54 +02:00
2011-04-17 23:43:54 +02:00
2011-04-03 16:40:12 +02:00
2011-04-17 23:43:54 +02:00
2011-04-20 04:48:23 +02:00
2011-04-17 23:43:54 +02:00
2011-03-19 15:24:31 +00:00
2011-04-21 22:44:55 +02:00
2011-03-28 00:16:44 +02:00
2011-04-03 02:28:01 +02:00
2011-04-18 18:23:16 +02:00
2011-04-17 23:43:54 +02:00
2011-04-17 23:43:54 +02:00
2011-04-22 03:54:30 +02:00
2011-04-22 03:54:30 +02:00
2011-04-22 03:54:30 +02:00
2011-04-11 04:08:08 +02:00
2011-04-17 23:43:54 +02:00
2011-04-17 23:43:54 +02:00
2011-04-22 03:54:30 +02:00
2011-04-20 04:48:23 +02:00