[FFmpeg-cvslog] Merge commit '7536c671040f1f3ebc9f0d3b7831dac71436b775'
Michael Niedermayer
git at videolan.org
Thu Apr 11 01:23:14 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 01:14:01 2013 +0200| [ab6091f8e21df7280f2b50fd6226bbc130fb060a] | committer: Michael Niedermayer
Merge commit '7536c671040f1f3ebc9f0d3b7831dac71436b775'
* commit '7536c671040f1f3ebc9f0d3b7831dac71436b775':
vf_yadif: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_yadif.c
libavfilter/yadif.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ab6091f8e21df7280f2b50fd6226bbc130fb060a
---
More information about the ffmpeg-cvslog
mailing list