ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Jan 9
20:51:17 2015 +0100| [1cf0f27985965c28049b7a8481c859867dad3948] | committer:
Michael Niedermayer
Merge commit '7e4e010b80e76862e83afbd41c25d50e72f0b44c'
* commit '7e4e010b80e76862e83afbd41c25d50e72f0b44c':
mpeg4audio: check the init_get_bits() return value
Conflicts:
libavcodec/mpeg4audio.c
See: deefdf9788467edd262b9c29a4f6e33d2ae84b8c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1cf0f27985965c28049b7a8481c859867dad3948
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
