[FFmpeg-cvslog] Merge commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff'
Michael Niedermayer
git at videolan.org
Wed Apr 10 13:37:09 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 10 13:27:33 2013 +0200| [828044aca289f12356e1bdcda232430d8ed22e2d] | committer: Michael Niedermayer
Merge commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff'
* commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff':
af_resample: switch to an AVOptions-based system.
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=828044aca289f12356e1bdcda232430d8ed22e2d
---
More information about the ffmpeg-cvslog
mailing list