• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 574dcb5b
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    574dcb5b
ffmpeg.texi 42.9 KB