[FFmpeg-cvslog] Merge commit 'a2816230c5c0a8fc72bc0163b7d21a96b194d87a'
Michael Niedermayer
git at videolan.org
Wed Mar 13 13:52:10 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 13 13:45:50 2013 +0100| [bb3823d457104d883a81ee332a005ad42e80409f] | committer: Michael Niedermayer
Merge commit 'a2816230c5c0a8fc72bc0163b7d21a96b194d87a'
* commit 'a2816230c5c0a8fc72bc0163b7d21a96b194d87a':
avframe: call release_buffer only if it is set
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bb3823d457104d883a81ee332a005ad42e80409f
---
More information about the ffmpeg-cvslog
mailing list