[FFmpeg-cvslog] Merge commit '4efdadc8ec50332c812e8a95e8c67f5a260e7cb0'

Michael Niedermayer git at videolan.org
Wed May 28 12:55:59 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 28 12:49:28 2014 +0200| [1c0ce2d4e0e70fcc42aa73fb5284f621025bb6c4] | committer: Michael Niedermayer

Merge commit '4efdadc8ec50332c812e8a95e8c67f5a260e7cb0'

* commit '4efdadc8ec50332c812e8a95e8c67f5a260e7cb0':
  matroskadec: export just the STREAMINFO block as FLAC extradata

Conflicts:
	libavformat/matroskadec.c

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

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





More information about the ffmpeg-cvslog mailing list