diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-22 04:27:07 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-22 04:40:12 +0200 |
commit | 32f550ee01bb8de450f6dd3d92ae977a8f6e21aa (patch) | |
tree | 574387721814108e039b875284161e008645c005 /libavcodec/mjpeg.c | |
parent | 914ab4cd1c59eae10771f2d6a892ec6b6f36b0e2 (diff) | |
parent | 898268a23b3c168adf44d9b3d70a2f2cbb6edda5 (diff) | |
download | ffmpeg-32f550ee01bb8de450f6dd3d92ae977a8f6e21aa.tar.gz |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Add a fate test for ProRes Transparency.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpeg.c')
0 files changed, 0 insertions, 0 deletions