[FFmpeg-cvslog] Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45'
Michael Niedermayer
git at videolan.org
Sun Aug 10 18:38:15 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 10 18:20:37 2014 +0200| [78eaaa857e95fa5542dc008c8ad3664e6ab6801a] | committer: Michael Niedermayer
Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45'
* commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45':
avresample: Introduce AVFrame-based API
Conflicts:
libavresample/utils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=78eaaa857e95fa5542dc008c8ad3664e6ab6801a
---
More information about the ffmpeg-cvslog
mailing list