ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Wed Oct 22
00:17:29 2014 +0200| [42316907b874fc7bc73ec227d2ad21774a662fc9] | committer:
Michael Niedermayer
Merge commit 'af7ca6ea124b82b337a6b96e10963e88eba57ebe'
* commit 'af7ca6ea124b82b337a6b96e10963e88eba57ebe':
nutdec: check av_new_packet return value
Conflicts:
libavformat/nutdec.c
See: bb502411ddb9fe1928d4a999693a3a49b83f8698
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=42316907b874fc7bc73ec227d2ad21774a662fc9
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
