ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Dec 19
04:57:25 2014 +0100| [988d27b8029d9b4ccb13e792004cc8375b835eac] | committer:
Michael Niedermayer
Merge commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e'
* commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e':
check memory errors from av_strdup()
Conflicts:
avprobe.c
libavformat/matroskaenc.c
libavutil/opt.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=988d27b8029d9b4ccb13e792004cc8375b835eac
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
