diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-17 00:44:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-17 00:44:32 +0200 |
| commit | e99f324c143a2d825b2be260cb6a799dbfe97a10 (patch) | |
| tree | ab05a337bab6dc0813445ece7bab027250d53ef0 /libavformat/libnut.c | |
| parent | 6c655b40eaceb77a8f4a8f32775db969935de746 (diff) | |
| parent | 58c95448e42d34910b939363949ba1a92c06b0b0 (diff) | |
| download | ffmpeg-e99f324c143a2d825b2be260cb6a799dbfe97a10.tar.gz | |
Merge commit '58c95448e42d34910b939363949ba1a92c06b0b0'
* commit '58c95448e42d34910b939363949ba1a92c06b0b0':
smacker: pad the extradata allocation
Conflicts:
libavformat/smacker.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/libnut.c')
0 files changed, 0 insertions, 0 deletions