aboutsummaryrefslogtreecommitdiffstats
path: root/tests/ffserver.regression.ref
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-12 14:03:50 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-12 14:03:54 +0200
commit23c8a3353bd948f4a69116124dc433c85909d86e (patch)
tree4d992f5ed5291216815f8289fd4d7c093eb3c73b /tests/ffserver.regression.ref
parentaeddc6e3a552d094dfb890dd1f017421816e367b (diff)
parenta52b5a5a07b0d432f9bed90b6d56647f8d44fbce (diff)
downloadffmpeg-23c8a3353bd948f4a69116124dc433c85909d86e.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: riff: Add a mapping for VP6A Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ffserver.regression.ref')
0 files changed, 0 insertions, 0 deletions