aboutsummaryrefslogtreecommitdiffstats
path: root/libavresample
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-29 21:17:41 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-29 21:18:11 +0200
commit92de4450347cbee96e64de341ac6fa733ea13cd1 (patch)
treef50e9b877f491582ebe908dc91fc1c2e013133e8 /libavresample
parent8cad746093dbabc0a46ce6dc05e2443261930162 (diff)
parentfa38573cd9ce4ab727f86f57c03b113cfd4c9d0a (diff)
downloadffmpeg-92de4450347cbee96e64de341ac6fa733ea13cd1.tar.gz
Merge commit 'fa38573cd9ce4ab727f86f57c03b113cfd4c9d0a'
* commit 'fa38573cd9ce4ab727f86f57c03b113cfd4c9d0a': matroska: Register mime types Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
0 files changed, 0 insertions, 0 deletions