Michael Niedermayer 8bf90562f6 Merge commit 'eb3b5501e8b85bfea09d533314cb6920efc42639' ...

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

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

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

2014-05-01 04:29:40 +02:00

105 KiB

Raw Blame History

View Raw