FFmpeg/libavcodec
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-20 15:08:41 -05:00
2012-01-14 01:17:06 +01:00
2012-01-14 17:23:57 +01:00
2012-01-12 16:32:55 +01:00
2012-01-14 04:47:27 +01:00
2012-01-28 21:59:01 +01:00
2012-01-14 01:15:42 +01:00
2012-02-24 03:30:42 +01:00
2012-02-02 18:44:52 +01:00
2012-02-20 15:08:41 -05:00
2012-02-01 04:43:06 +01:00
2011-12-23 05:58:32 +01:00
2012-01-26 19:54:38 +01:00
2012-02-19 03:57:54 +01:00
2012-02-14 01:22:38 +01:00
2012-02-24 04:12:40 +01:00
2012-02-14 01:22:38 +01:00
2012-02-07 18:28:00 +01:00
2012-02-18 02:31:38 +01:00
2012-01-07 00:11:43 +01:00
2011-12-17 05:04:56 +01:00
2012-02-24 04:13:01 +01:00
2012-02-19 16:26:46 +01:00
2012-02-14 19:03:10 +01:00
2011-12-13 21:08:43 +01:00
2012-02-16 06:25:32 +01:00
2011-12-30 20:00:53 +01:00
2012-02-23 23:38:20 +01:00
2012-02-23 23:42:04 +01:00
2012-01-08 20:22:12 +01:00
2012-01-08 20:22:12 +01:00
2012-01-08 20:22:12 +01:00
2012-02-22 11:37:32 +01:00
2012-01-23 19:04:35 +01:00
2012-01-23 19:04:35 +01:00
2012-02-25 07:45:06 +01:00
2012-02-23 23:40:51 +01:00
2012-02-04 01:12:04 +01:00