Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 27 Feb 2012 01:33:48 +0000 (02:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 27 Feb 2012 03:35:35 +0000 (04:35 +0100)
commit574dcb5baf26c7cce755b51e445ca7109f0f1260
tree1a2fd2363b4b0b9a50ed7f2dd9f2b3aff08b72eb
parent59affed23c3a30b85c006c45f9e5d3aa8ce50741
parent7929e22bdea3bc40735d31ed7ddbf047732c3b9f
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>
doc/ffmpeg.texi
ffmpeg.c
libavcodec/cdxl.c
tests/fate/h264.mak