Michael Niedermayer
574dcb5baf
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
lavf: don't guess r_frame_rate from either stream or codec timebase.
avconv: set discard on input streams automatically.
Fix parser not to clobber has_b_frames when extradata is set.
lavf: don't set codec timebase in avformat_find_stream_info().
avconv: saner output video timebase.
rawdec: set timebase to 1/fps.
avconv: refactor vsync code.
FATE: remove a bunch of useless -vsync 0
cdxl: bit line plane arrangement support
cdxl: remove early check for bpp
cdxl: set pix_fmt PAL8 only if palette is available
Conflicts:
ffmpeg.c
libavcodec/h264_parser.c
libavformat/rawdec.c
tests/fate/demux.mak
tests/fate/ea.mak
tests/fate/h264.mak
tests/fate/prores.mak
tests/fate/video.mak
tests/ref/fate/bethsoft-vid
tests/ref/fate/creatureshock-avs
tests/ref/fate/ea-cmv
tests/ref/fate/interplay-mve-16bit
tests/ref/fate/interplay-mve-8bit
tests/ref/fate/nuv
tests/ref/fate/prores-alpha
tests/ref/fate/qtrle-16bit
tests/ref/fate/qtrle-1bit
tests/ref/fate/real-rv40
tests/ref/fate/rpza
tests/ref/fate/wmv8-drm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-27 04:35:35 +01:00
2012-02-16 01:34:37 +01:00
2012-02-25 04:00:43 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-25 04:00:43 +01:00
2012-02-16 01:34:37 +01:00
2012-02-24 02:57:18 +01:00
2012-02-25 02:41:42 +01:00
2012-02-21 05:10:12 +01:00
2012-02-11 01:22:22 +01:00
2012-02-23 04:31:55 +01:00
2012-02-11 01:22:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-24 02:57:18 +01:00
2012-02-24 02:57:18 +01:00
2012-02-14 01:53:31 +01:00
2012-02-16 01:34:37 +01:00
2012-02-24 02:57:18 +01:00
2012-02-24 02:57:18 +01:00
2012-02-25 02:50:58 +01:00
2012-02-21 05:10:12 +01:00
2012-02-20 15:08:41 -05:00
2012-02-12 01:06:13 +01:00
2012-02-24 02:57:18 +01:00
2012-02-17 12:35:08 -08:00
2012-02-11 08:23:42 +01:00
2012-02-16 01:34:37 +01:00
2012-02-24 02:57:18 +01:00
2012-02-16 01:34:37 +01:00
2012-02-17 00:35:06 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-26 05:11:21 +01:00
2012-02-17 00:35:06 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-11 01:22:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-13 02:06:44 +01:00
2012-02-10 01:20:07 +01:00
2012-02-11 01:22:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-27 04:35:35 +01:00
2012-02-13 02:06:44 +01:00
2012-02-18 02:20:19 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-16 23:01:47 +01:00
2012-02-16 03:05:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-18 02:20:19 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-18 02:20:19 +01:00
2012-02-22 02:24:18 +01:00
2012-02-11 01:22:22 +01:00
2012-02-11 01:22:22 +01:00
2012-02-09 19:16:15 -08:00
2012-02-10 01:20:07 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-14 01:53:31 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-24 02:57:18 +01:00
2012-02-21 05:10:12 +01:00
2012-02-24 04:22:20 +01:00
2012-02-24 02:57:18 +01:00
2012-02-07 01:40:29 +01:00
2012-02-24 03:30:42 +01:00
2012-02-24 02:57:18 +01:00
2012-02-20 01:29:30 +01:00
2012-02-26 05:11:21 +01:00
2012-02-25 11:49:41 -05:00
2012-02-16 23:25:51 +01:00
2012-02-25 04:00:43 +01:00
2012-02-24 02:57:18 +01:00
2012-02-25 04:00:43 +01:00
2012-02-20 15:08:41 -05:00
2012-02-16 01:34:37 +01:00
2012-02-20 01:29:30 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-11 01:22:22 +01:00
2012-02-11 01:22:22 +01:00
2012-02-26 15:50:59 +01:00
2012-02-19 03:57:54 +01:00
2012-02-11 01:22:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-21 05:10:12 +01:00
2012-02-14 01:22:38 +01:00
2012-02-16 01:34:37 +01:00
2012-02-09 01:27:12 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-21 05:10:12 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-24 04:12:40 +01:00
2012-02-15 22:06:38 +02:00
2012-02-06 19:39:24 +01:00
2012-02-14 01:22:38 +01:00
2012-02-14 01:22:38 +01:00
2012-02-24 02:57:18 +01:00
2012-02-15 22:06:46 +02:00
2012-02-16 01:34:37 +01:00
2012-02-26 05:11:21 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-25 04:00:43 +01:00
2012-02-24 02:57:18 +01:00
2012-02-26 05:11:21 +01:00
2012-02-25 11:49:41 -05:00
2012-02-21 05:10:12 +01:00
2012-02-25 11:49:41 -05:00
2012-02-24 02:57:18 +01:00
2012-02-26 05:11:21 +01:00
2012-02-09 23:55:33 +01:00
2012-02-24 02:57:18 +01:00
2012-02-07 18:28:00 +01:00
2012-02-26 05:11:21 +01:00
2012-02-26 05:11:21 +01:00
2012-02-26 05:11:21 +01:00
2012-02-24 02:57:18 +01:00
2012-02-18 02:31:38 +01:00
2012-02-24 02:57:18 +01:00
2012-02-22 02:24:18 +01:00
2012-02-24 02:57:18 +01:00
2012-02-24 02:57:18 +01:00
2012-02-07 01:40:29 +01:00
2012-02-07 01:40:29 +01:00
2012-02-24 04:22:20 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-25 04:00:43 +01:00
2012-02-20 01:29:30 +01:00
2012-02-25 17:24:43 -05:00
2012-02-22 02:24:18 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-11 01:22:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-20 01:29:30 +01:00
2012-02-16 01:34:37 +01:00
2012-02-20 01:29:30 +01:00
2012-02-21 05:10:12 +01:00
2012-02-25 06:47:57 +01:00
2012-02-26 05:11:21 +01:00
2012-02-16 01:34:37 +01:00
2012-02-22 02:24:18 +01:00
2012-02-11 01:22:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-20 01:29:30 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-14 01:53:31 +01:00
2012-02-24 04:13:01 +01:00
2012-02-16 01:34:37 +01:00
2012-02-26 05:11:21 +01:00
2012-02-16 01:34:37 +01:00
2012-02-14 01:53:31 +01:00
2012-02-19 04:15:22 +01:00
2012-02-11 01:22:22 +01:00
2012-02-11 01:22:22 +01:00
2012-02-25 11:49:41 -05:00
2012-02-21 05:10:12 +01:00
2012-02-22 03:37:18 +01:00
2012-02-10 23:18:52 +01:00
2012-02-22 02:24:18 +01:00
2012-02-19 16:26:46 +01:00
2012-02-21 05:10:12 +01:00
2012-02-21 05:10:12 +01:00
2012-02-15 07:14:45 +01:00
2012-02-15 07:14:45 +01:00
2012-02-16 19:55:16 +01:00
2012-02-23 04:31:55 +01:00
2012-02-17 16:49:30 +01:00
2012-02-16 01:34:37 +01:00
2012-02-24 04:13:27 +01:00
2012-02-23 04:31:55 +01:00
2012-02-12 20:24:29 +01:00
2012-02-24 02:57:18 +01:00
2012-02-22 03:45:43 +01:00
2012-02-26 05:11:21 +01:00
2012-02-16 01:34:37 +01:00
2012-02-09 23:25:46 +01:00
2012-02-09 01:27:12 +01:00
2012-02-10 01:20:07 +01:00
2012-02-16 01:34:37 +01:00
2012-02-26 05:11:21 +01:00
2012-02-21 05:10:12 +01:00
2012-02-21 05:10:12 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-20 01:29:30 +01:00
2012-02-20 01:29:30 +01:00
2012-02-14 19:03:10 +01:00
2012-02-16 01:34:37 +01:00
2012-02-15 01:52:14 +01:00
2012-02-16 01:34:37 +01:00
2012-02-20 14:58:25 -08:00
2012-02-20 14:58:25 -08:00
2012-02-16 01:34:37 +01:00
2012-02-22 02:24:18 +01:00
2012-02-23 15:50:06 -08:00
2012-02-23 15:50:06 -08:00
2012-02-21 05:10:12 +01:00
2012-02-17 00:35:06 +01:00
2012-02-18 02:20:19 +01:00
2012-02-18 02:20:19 +01:00
2012-02-18 02:20:19 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 06:25:32 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-24 02:57:18 +01:00
2012-02-22 02:24:18 +01:00
2012-02-17 14:28:56 -05:00
2012-02-19 15:54:27 +01:00
2012-02-16 01:34:37 +01:00
2012-02-18 02:20:19 +01:00
2012-02-16 01:34:37 +01:00
2012-02-21 05:10:12 +01:00
2012-02-25 04:00:43 +01:00
2012-02-24 02:57:18 +01:00
2012-02-24 02:57:18 +01:00
2012-02-16 01:34:37 +01:00
2012-02-20 01:29:30 +01:00
2012-02-16 01:34:37 +01:00
2012-02-26 05:11:21 +01:00
2012-02-16 01:34:37 +01:00
2012-02-06 08:00:31 +01:00
2012-02-18 02:20:19 +01:00
2012-02-23 23:38:20 +01:00
2012-02-23 23:42:04 +01:00
2012-02-21 05:10:12 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-22 11:37:32 +01:00
2012-02-16 01:34:37 +01:00
2012-02-26 05:11:21 +01:00
2012-02-26 05:11:21 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-07 01:40:29 +01:00
2012-02-19 01:47:10 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-24 02:57:18 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-19 22:08:21 +01:00
2012-02-18 02:20:19 +01:00
2012-02-16 01:34:37 +01:00
2012-02-20 01:29:30 +01:00
2012-02-17 00:35:06 +01:00
2012-02-25 07:45:06 +01:00
2012-02-22 03:45:43 +01:00
2012-02-23 23:40:51 +01:00
2012-02-21 05:10:12 +01:00
574dcb5baf