ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Fri Dec 5
22:19:55 2014 +0100| [9d921cce4f5501e4c507cc921f76a283bee39d09] | committer:
Michael Niedermayer
Merge commit '3a56bcee7cb7549b2813e39ce3bee3b7c522aecb'
* commit '3a56bcee7cb7549b2813e39ce3bee3b7c522aecb':
mpeg12dec: Use more specific error codes
Conflicts:
libavcodec/mpeg12dec.c
See: 1852b2a0f497d3c5437d5b50379d7874fc8c285a
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d921cce4f5501e4c507cc921f76a283bee39d09
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
