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-06-03 05:19:30 +02:00
2011-06-11 03:51:36 +02:00
2011-06-13 19:02:50 +02:00
2011-05-17 01:56:01 +02:00
2011-05-15 03:25:57 +02:00
2011-06-03 05:19:30 +02:00
2011-06-09 04:47:19 +02:00
2011-06-18 05:10:38 +02:00
2011-05-13 04:40:40 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-06-18 05:10:38 +02:00
2011-06-18 05:10:38 +02:00
2011-06-09 04:47:19 +02:00
2011-05-22 04:53:19 +02:00
2011-06-01 20:29:27 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-05-15 03:25:57 +02:00
2011-04-28 10:45:32 +02:00
2011-06-09 04:47:19 +02:00
2011-05-17 01:47:12 +02:00
2011-05-27 23:48:22 +02:00
2011-06-09 02:43:55 +02:00
2011-05-01 00:26:05 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-05-02 18:38:01 +02:00
2011-05-02 18:38:01 +02:00
2011-04-25 12:13:51 +10:00
2011-06-11 03:51:36 +02:00
2011-05-22 04:53:19 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-05-05 03:30:24 +02:00
2011-06-09 04:47:19 +02:00
2011-04-18 18:23:16 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-06-03 05:19:30 +02:00
2011-04-21 03:37:05 +02:00
2011-05-02 16:41:41 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-05-17 23:01:42 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-06-13 20:43:29 +02:00
2011-06-05 03:00:31 +02:00
2011-06-11 03:51:36 +02:00
2011-06-03 05:19:30 +02:00
2011-06-17 11:02:12 +02:00
2011-05-17 01:47:12 +02:00
2011-04-20 04:48:23 +02:00
2011-05-27 23:48:22 +02:00
2011-06-10 10:49:20 +03:00
2011-05-24 23:34:24 +02:00
2011-05-29 03:34:35 +02:00
2011-06-14 02:00:06 +02:00
2011-06-14 01:53:40 +02:00
2011-04-20 04:48:23 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-06-03 05:19:30 +02:00
2011-04-20 04:48:23 +02:00
2011-05-22 04:53:19 +02:00
2011-06-16 20:15:53 +02:00
2011-05-17 03:05:36 +02:00
2011-06-13 19:02:50 +02:00
2011-06-11 03:51:36 +02:00
2011-06-11 03:51:36 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-06-11 03:51:36 +02:00
2011-06-11 03:51:36 +02:00
2011-06-11 03:51:36 +02:00
2011-06-09 04:47:19 +02:00
2011-05-27 23:48:22 +02:00
2011-06-02 05:12:10 +02:00
2011-06-05 03:00:31 +02:00
2011-06-13 18:30:55 +02:00
2011-04-28 07:25:28 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-06-03 21:14:30 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-05-30 00:24:01 +02:00
2011-06-02 20:06:00 +01:00
2011-06-08 07:43:45 +02:00
2011-06-03 05:19:30 +02:00
2011-06-18 05:10:38 +02:00
2011-05-13 04:40:40 +02:00
2011-04-24 03:41:22 +02:00
2011-05-26 03:28:22 +02:00
2011-06-09 04:47:19 +02:00
2011-06-06 03:33:58 +02:00
2011-06-05 03:00:31 +02:00
2011-05-27 23:48:22 +02:00
2011-06-18 05:10:38 +02:00
2011-06-10 04:47:23 +02:00
2011-06-03 05:19:30 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-05-26 03:28:22 +02:00
2011-05-26 03:28:22 +02:00
2011-04-24 03:41:22 +02:00
2011-06-18 05:10:38 +02:00
2011-04-24 03:41:22 +02:00
2011-06-03 05:19:30 +02:00
2011-04-24 03:41:22 +02:00
2011-04-24 03:41:22 +02:00
2011-05-13 04:40:40 +02:00
2011-04-24 03:41:22 +02:00
2011-04-24 03:41:22 +02:00
2011-04-24 03:41:22 +02:00
2011-04-24 03:41:22 +02:00
2011-06-04 06:35:17 +02:00
2011-04-24 03:41:22 +02:00
2011-06-18 05:10:38 +02:00
2011-06-15 20:21:33 +02:00
2011-06-17 05:49:58 +02:00
2011-06-11 03:51:36 +02:00
2011-06-11 03:51:36 +02:00
2011-05-10 04:03:17 +02:00
2011-06-17 05:49:58 +02:00
2011-06-11 03:51:36 +02:00
2011-06-08 05:25:28 +02:00
2011-06-11 03:51:36 +02:00
2011-06-18 05:10:38 +02:00
2011-04-20 04:48:23 +02:00
2011-06-09 04:47:19 +02:00
2011-06-11 03:51:36 +02:00
2011-06-02 20:06:00 +01:00
2011-06-03 05:19:30 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-05-22 04:53:19 +02:00
2011-05-17 23:01:42 +02:00
2011-04-24 17:46:50 +02:00
2011-05-30 02:39:26 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-06-04 16:55:22 +02:00
2011-05-22 04:53:19 +02:00
2011-06-18 05:10:38 +02:00
2011-06-18 05:10:38 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-06-13 20:47:06 +02:00
2011-06-09 04:47:19 +02:00
2011-06-08 07:43:45 +02:00
2011-05-01 21:13:18 +02:00
2011-06-13 19:02:50 +02:00
2011-06-09 04:47:19 +02:00
2011-06-02 20:06:00 +01:00
2905e3ff64