ffmpeg | branch: master | Michael Niedermayer <[email protected]> | 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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=78eaaa857e95fa5542dc008c8ad3664e6ab6801a
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
