ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Wed Oct 29
22:09:06 2014 +0100| [a3b1e42ec4f44c4d67a6efcf6f65527b2c952432] | committer:
Michael Niedermayer
Merge commit 'e9ba3098319f78c91470c05da988d865491852c5'
* commit 'e9ba3098319f78c91470c05da988d865491852c5':
assdec: check av_new_packet return value
Conflicts:
libavformat/assdec.c
See: 7c9f9685ae2d45d5bbb939483a01266622e8f14c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a3b1e42ec4f44c4d67a6efcf6f65527b2c952432
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
