• 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
Name
Last commit
Last update
..
doxy Loading commit data...
examples Loading commit data...
APIchanges Loading commit data...
Makefile Loading commit data...
RELEASE_NOTES Loading commit data...
avtools-common-opts.texi Loading commit data...
avutil.txt Loading commit data...
bitstream_filters.texi Loading commit data...
build_system.txt Loading commit data...
decoders.texi Loading commit data...
demuxers.texi Loading commit data...
developer.texi Loading commit data...
encoders.texi Loading commit data...
errno.txt Loading commit data...
eval.texi Loading commit data...
faq.texi Loading commit data...
fate.texi Loading commit data...
ffmpeg-mt-authorship.txt Loading commit data...
ffmpeg.texi Loading commit data...
ffmpeg.txt Loading commit data...
ffplay.texi Loading commit data...
ffprobe.texi Loading commit data...
ffprobe.xsd Loading commit data...
ffserver.conf Loading commit data...
ffserver.texi Loading commit data...
filters.texi Loading commit data...
general.texi Loading commit data...
git-howto.texi Loading commit data...
git-howto.txt Loading commit data...
indevs.texi Loading commit data...
issue_tracker.txt Loading commit data...
libavfilter.texi Loading commit data...
metadata.texi Loading commit data...
multithreading.txt Loading commit data...
muxers.texi Loading commit data...
optimization.txt Loading commit data...
outdevs.texi Loading commit data...
platform.texi Loading commit data...
protocols.texi Loading commit data...
rate_distortion.txt Loading commit data...
snow.txt Loading commit data...
soc.txt Loading commit data...
swresample.txt Loading commit data...
swscale.txt Loading commit data...
t2h.init Loading commit data...
tablegen.txt Loading commit data...
texi2pod.pl Loading commit data...
viterbi.txt Loading commit data...