diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-22 12:02:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-22 12:07:53 +0100 |
| commit | 1ddc849bde0da856eef9a7f1b5b877941bd82ae4 (patch) | |
| tree | e8e65bb784d9472beb2fc0678e055d260afd7727 | |
| parent | fe540ae6b72a20e84f828b2e37a0a538631b4049 (diff) | |
| parent | 30be1ea33e5525266ad871bed60b1893a53caeaf (diff) | |
| download | ffmpeg-1ddc849bde0da856eef9a7f1b5b877941bd82ae4.tar.gz | |
Merge commit '30be1ea33e5525266ad871bed60b1893a53caeaf'
* commit '30be1ea33e5525266ad871bed60b1893a53caeaf':
matroskadec: pad EBML_BIN data.
Conflicts:
libavformat/matroskadec.c
See: c63e76ba3553d7635b92ac3801f3087e85a76bfb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions