[FFmpeg-cvslog] Merge commit '932788be5af8dee062c77851b573ea47dd6d047a'
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:53:53 2015 +0100| [24c76bae5f47c14ed70e4857eaa3138df566b4cc] | committer: Michael Niedermayer
Merge commit '932788be5af8dee062c77851b573ea47dd6d047a'
* commit '932788be5af8dee062c77851b573ea47dd6d047a':
id3v2: add names to the parameters of ID3v2EMFunc.read
Conflicts:
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=24c76bae5f47c14ed70e4857eaa3138df566b4cc
---
More information about the ffmpeg-cvslog
mailing list