[FFmpeg-cvslog] Merge commit 'eb3b5501e8b85bfea09d533314cb6920efc42639'

Michael Niedermayer git at videolan.org
Thu May 1 05:06:01 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May  1 04:27:17 2014 +0200| [8bf90562f6cb0f723d5935de1eb4c785037807f9] | committer: Michael Niedermayer

Merge commit 'eb3b5501e8b85bfea09d533314cb6920efc42639'

* commit 'eb3b5501e8b85bfea09d533314cb6920efc42639':
  matroskadec: read the CodecDelay element

Conflicts:
	libavformat/matroska.h
	libavformat/matroskadec.c

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

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





More information about the ffmpeg-cvslog mailing list