Files
ffmpeg/libavcodec
Michael Niedermayer 2905e3ff64 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lavc: add opt_find to AVCodecContext class.
  h264: Complexify frame num gap shortening code
  intreadwrite.h: fix AV_RL32/AV_RB32 signedness.
  Fix decoding of mpegts streams with h264 video that does *NOT* have b frames
  Add minor bumps and APIChanges entries for lavf private options.
  ffmpeg: deprecate -vc and -tvstd
  ffmpeg: use new avformat_open_* API.
  ffserver: use new avformat_open_* API.
  ffprobe: use new avformat_open_* API.
  ffplay: use new avformat_open_* API.
  cmdutils: add opt_default2().
  dict: add AV_DICT_APPEND flag.
  lavf: add avformat_write_header() as a replacement for av_write_header().
  Deprecate av_open_input_* and remove their uses.
  lavf: add avformat_open_input() as a replacement for av_open_input_*
  AVOptions: add av_opt_find() as a replacement for av_find_opt.
  AVOptions: add av_opt_set_dict() mapping a dictionary struct to a context.
  ffmpeg: don't abuse a global for passing frame size from input to output
  ffmpeg: don't abuse a global for passing pixel format from input to output
  ffmpeg: initialise encoders earlier.

Conflicts:
	cmdutils.c
	doc/APIchanges
	ffmpeg.c
	ffplay.c
	ffprobe.c
	libavcodec/h264.c
	libavformat/avformat.h
	libavformat/utils.c
	libavformat/version.h
	libavutil/avutil.h

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