[FFmpeg-cvslog] Merge commit 'f3d57dc69145f1b7acb4870da9ce60378190a1fd'
Michael Niedermayer
git at videolan.org
Thu Sep 12 13:05:58 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 12 12:57:58 2013 +0200| [af539319af3a2c173e275fb927c7069e6b167114] | committer: Michael Niedermayer
Merge commit 'f3d57dc69145f1b7acb4870da9ce60378190a1fd'
* commit 'f3d57dc69145f1b7acb4870da9ce60378190a1fd':
smacker: Free memory properly if the init function fails
Conflicts:
libavcodec/smacker.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=af539319af3a2c173e275fb927c7069e6b167114
---
More information about the ffmpeg-cvslog
mailing list