• Michael Niedermayer's avatar
    Merge commit 'fe1c1198' · 7c26761b
    Michael Niedermayer authored
    * commit 'fe1c1198':
      lavf: use dts difference instead of AVPacket.duration in find_stream_info()
      avf: introduce nobuffer option
      fate: make yadif tests consistent across systems
      vf_hqdn3d: support 9 and 10bit colordepth
      vf_hqdn3d: reduce intermediate precision
      vf_hqdn3d: simplify and optimize
      factor identical ff_inplace_start_frame out of two filters
      vf_hqdn3d: cosmetics
      avprobe/avconv: fix tentative declaration compile errors on MSVS.
    
    Conflicts:
    	doc/APIchanges
    	ffmpeg.c
    	ffprobe.c
    	libavformat/avformat.h
    	libavformat/options_table.h
    	libavformat/utils.c
    	libavformat/version.h
    	tests/fate/filter.mak
    	tests/ref/fate/filter-yadif-mode0
    	tests/ref/fate/filter-yadif-mode1
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    7c26761b
options_table.h 6.07 KB