Merge commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Jul 2012 20:58:17 +0000 (22:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Jul 2012 21:04:49 +0000 (23:04 +0200)
commit7c26761b8121ed362870b2e0eb06b85431bdd7a2
tree5e8bc55238ce090b34e5e8cd7777fc4dd5e7fb76
parent72dabdfc58064fcb249f26fc7afca2221f18a832
parentfe1c1198e670242f3cf9e3e1eef27cff77f3ee23
Merge commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23'

* commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23':
  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: Michael Niedermayer <michaelni@gmx.at>
15 files changed:
doc/APIchanges
ffmpeg.c
ffprobe.c
libavfilter/vf_delogo.c
libavfilter/vf_gradfun.c
libavfilter/vf_hqdn3d.c
libavfilter/video.c
libavfilter/video.h
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