ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Jun 1
01:32:12 2015 +0200| [63fdedc79470de309693d7ce7fe75cfcf0a268d8] | committer:
Michael Niedermayer
Merge commit '074a1b37325bf6d1483fc23ebf1255e78d998339'
* commit '074a1b37325bf6d1483fc23ebf1255e78d998339':
aacpsy: Check memory allocation
Conflicts:
libavcodec/aacpsy.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=63fdedc79470de309693d7ce7fe75cfcf0a268d8
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
