diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 11:18:13 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 11:18:20 +0200 |
commit | c6b425896541c6cc0b58c1aceb8821333f4049bc (patch) | |
tree | 9a97ed7e1222c52797213338b7120d8cf2bfbe43 /tests/test.ffmeta | |
parent | c6526620a9a802e89f92c7f3469a6adbb321970c (diff) | |
parent | 1eb932803037a3c9f98f66aeb80024dfa3c5c743 (diff) | |
download | ffmpeg-c6b425896541c6cc0b58c1aceb8821333f4049bc.tar.gz |
Merge commit '1eb932803037a3c9f98f66aeb80024dfa3c5c743'
* commit '1eb932803037a3c9f98f66aeb80024dfa3c5c743':
asfenc: add ASF_Reserved_4 as defined in section 10.10 of the ASF spec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/test.ffmeta')
0 files changed, 0 insertions, 0 deletions