[FFmpeg-cvslog] Merge commit '379e5603f4131e677ecf5ba79973dcd5603f28ea'
Michael Niedermayer
git at videolan.org
Sun May 10 22:59:39 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 10 22:50:22 2015 +0200| [1cf81a2c509ebb0421ea6d0745eb3dbc99ac6f4c] | committer: Michael Niedermayer
Merge commit '379e5603f4131e677ecf5ba79973dcd5603f28ea'
* commit '379e5603f4131e677ecf5ba79973dcd5603f28ea':
id3v2: Do not export empty APIC description
Conflicts:
libavformat/id3v2.c
See: b697b297b77f73c932307120e32c187d521d2ff7
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1cf81a2c509ebb0421ea6d0745eb3dbc99ac6f4c
---
More information about the ffmpeg-cvslog
mailing list