ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Jun 1
02:46:56 2015 +0200| [211dcdca5cd98173b76ea219a119c412b6ba8635] | committer:
Michael Niedermayer
Merge commit '522d971c7f5921bebcea2fc50e67056afdabb951'
* commit '522d971c7f5921bebcea2fc50e67056afdabb951':
xsub: Check memory allocation
Conflicts:
libavcodec/xsubdec.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=211dcdca5cd98173b76ea219a119c412b6ba8635
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
