diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-26 14:53:10 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-26 14:53:15 +0200 |
commit | 09ea5048a9afcb3478fa310bfdc5636222eaf1c7 (patch) | |
tree | dd503e8183e9ded483426e5602fe662be9f7ba87 /tests/ref/acodec | |
parent | 6063f012f2f1c5c54ad518330d1d8cceba68d855 (diff) | |
parent | 4eb4bb3a022a4126f5f749ad971f644467c0369e (diff) | |
download | ffmpeg-09ea5048a9afcb3478fa310bfdc5636222eaf1c7.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
imc: support mode 1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/acodec')
0 files changed, 0 insertions, 0 deletions