falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Merge commit '30be1ea33e5525266ad871bed60b1893a53caeaf' 

* commit '30be1ea33e5525266ad871bed60b1893a53caeaf':
  matroskadec: pad EBML_BIN data.

Conflicts:
	libavformat/matroskadec.c

See: c63e76ba35
Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.2-rc1
Michael Niedermayer 12 years ago
parent
fe540ae6b7 30be1ea33e
commit
1ddc849bde
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available