Michael Niedermayer
bb258fb995
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
doc: Improve references to external URLs.
h264: move decode_mb_skip() from h264.h to h.264_mvpred.h
ffplay: skip return value of avcodec_decode_video2 / avcodec_decode_subtitle2
dnxhdenc: Replace a forward declaration by the proper #include.
h264: move h264_mvpred.h include.
pix_fmt: Fix number of bits per component in yuv444p9be
lavf: deprecate AVFormatContext.timestamp
ffmpeg: merge input_files_ts_scale into InputStream.
ffmpeg: don't abuse a global for passing sample format from input to output
ffmpeg: don't abuse a global for passing channel layout from input to output
ffmpeg: factor common code from new_a/v/s/d_stream to new_output_stream()
matroskaenc: make SSA default subtitle codec.
oggdec: prevent heap corruption.
Conflicts:
doc/developer.texi
doc/faq.texi
doc/general.texi
ffmpeg.c
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-13 00:42:11 +02:00
2011-06-24 03:07:04 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-05-13 04:40:40 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-24 03:41:22 +02:00
2011-06-30 16:50:27 +01:00
2011-03-19 13:33:20 +00:00
2011-07-05 02:26:17 +02:00
2011-03-19 13:33:20 +00:00
2011-06-24 03:07:04 +02:00
2011-06-08 05:25:28 +02:00
2011-03-19 13:33:20 +00:00
2011-05-22 04:53:19 +02:00
2011-03-19 13:33:20 +00:00
2011-06-24 03:07:04 +02:00
2011-07-04 17:13:05 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-29 20:01:04 +02:00
2011-03-19 13:33:20 +00:00
2011-06-24 03:07:04 +02:00
2011-07-01 05:35:26 +02:00
2011-06-02 21:03:54 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-07-05 02:26:17 +02:00
2011-06-24 03:07:04 +02:00
2011-06-18 05:10:38 +02:00
2011-07-09 02:06:40 +02:00
2011-05-30 03:11:54 +02:00
2011-04-22 10:21:21 +02:00
2011-07-06 23:57:11 +02:00
2011-04-19 19:03:44 +02:00
2011-05-09 21:23:45 +02:00
2011-03-19 13:33:20 +00:00
2011-07-04 00:45:21 +02:00
2011-07-02 03:24:32 +02:00
2011-07-04 00:45:21 +02:00
2011-07-04 00:45:21 +02:00
2011-06-28 13:14:46 +02:00
2011-06-28 13:14:46 +02:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-18 05:10:38 +02:00
2011-06-08 05:25:28 +02:00
2011-03-19 13:33:20 +00:00
2011-07-04 00:45:21 +02:00
2010-01-16 04:49:02 +00:00
2011-04-22 03:54:30 +02:00
2011-07-12 01:42:32 +02:00
2011-03-19 13:33:20 +00:00
2011-05-09 04:50:56 +02:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-07-03 03:14:10 +02:00
2011-07-09 02:06:40 +02:00
2011-06-29 05:23:12 +02:00
2011-03-19 13:33:20 +00:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-06-07 03:17:42 +02:00
2011-05-01 00:26:05 +02:00
2011-07-09 02:06:40 +02:00
2011-06-19 19:13:05 +02:00
2011-07-04 00:45:21 +02:00
2011-06-08 05:25:28 +02:00
2011-06-29 23:49:03 +01:00
2011-06-29 23:49:03 +01:00
2011-07-13 00:42:11 +02:00
2011-06-06 11:34:45 +02:00
2011-06-30 04:32:24 +02:00
2011-04-21 03:37:05 +02:00
2011-06-30 21:19:16 +02:00
2011-06-30 04:32:24 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-24 03:07:04 +02:00
2011-06-25 22:06:30 +02:00
2011-06-08 05:25:28 +02:00
2011-07-05 02:26:17 +02:00
2011-03-19 13:33:20 +00:00
2011-05-11 13:43:30 +02:00
2011-05-11 13:43:30 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-27 03:51:04 +02:00
2011-03-19 13:33:20 +00:00
bb258fb995