[FFmpeg-cvslog] Merge commit 'c18375ec8040a9fe0f186b2033dc975883143758'

Michael Niedermayer git at videolan.org
Sun Oct 13 09:56:02 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct 13 09:49:50 2013 +0200| [77caa31f717a0cab628c05fcd61cf6d78fba527e] | committer: Michael Niedermayer

Merge commit 'c18375ec8040a9fe0f186b2033dc975883143758'

* commit 'c18375ec8040a9fe0f186b2033dc975883143758':
  oggvorbisdec: add support for embedded cover art

Conflicts:
	libavformat/oggparsevorbis.c

See: 193782216fc8179ec92d498449be0a51e4c7c658
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=77caa31f717a0cab628c05fcd61cf6d78fba527e
---





More information about the ffmpeg-cvslog mailing list