ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Jan 27
20:25:40 2015 +0100| [c5b6b711b291f7cc3fc215de43896537cb7cfa44] | committer:
Michael Niedermayer
Merge commit '607ad990d31e6be52980970e5ce8cd25ab3de812'
* commit '607ad990d31e6be52980970e5ce8cd25ab3de812':
dvbsubdec: check memory allocations and propagate errors
Conflicts:
libavcodec/dvbsubdec.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c5b6b711b291f7cc3fc215de43896537cb7cfa44
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
