diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 22:22:05 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 22:22:23 +0100 |
commit | c68e53f27281abe7d72147edd1326abf7449cdff (patch) | |
tree | cabb58f365838f07074aa48a8290b706232aacc1 /libavfilter/buffer.c | |
parent | 76367f453f6f7cb340c4798a2b059b81abc60c71 (diff) | |
parent | db32f14c3dfd75290b57a086183d6577457beac4 (diff) | |
download | ffmpeg-c68e53f27281abe7d72147edd1326abf7449cdff.tar.gz |
Merge commit 'db32f14c3dfd75290b57a086183d6577457beac4'
* commit 'db32f14c3dfd75290b57a086183d6577457beac4':
isom: add "MNG" FourCC
See: 8d0ec6e060b23c8ef188d759f59ee1e536c494ed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/buffer.c')
0 files changed, 0 insertions, 0 deletions