[FFmpeg-cvslog] Merge commit '54bc15d5ebfd07fd468743ba29f709ea19e840b9'
Michael Niedermayer
git at videolan.org
Thu Jan 15 13:10:20 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 15 12:58:25 2015 +0100| [eb215be9ce74f90d5aff304ad593f17a313f71fd] | committer: Michael Niedermayer
Merge commit '54bc15d5ebfd07fd468743ba29f709ea19e840b9'
* commit '54bc15d5ebfd07fd468743ba29f709ea19e840b9':
id3v2: fix reading v2.2 attached pictures
Conflicts:
libavformat/id3v2.c
See: 05c3c568dccd6c42fdf6eea891d08c71fe2ee772
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eb215be9ce74f90d5aff304ad593f17a313f71fd
---
More information about the ffmpeg-cvslog
mailing list