diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-07 01:59:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-07 01:59:22 +0200 |
| commit | 5f2b4a2f6a13aaa1139cadd70ae7652545eb9615 (patch) | |
| tree | e2b1b3120bb8e5b995408aacc0b932c959d8c9a7 /libavformat/img2_alias_pix.c | |
| parent | bc6f84fff74131e869b72a10ac2efe8b745779a4 (diff) | |
| parent | 2279de6eca1294082a307feb211b217781da8045 (diff) | |
| download | ffmpeg-5f2b4a2f6a13aaa1139cadd70ae7652545eb9615.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavf/img2dec: Autodetect qdraw images.
lavc/qdrw: Also support real-world qdraw images.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/img2_alias_pix.c')
0 files changed, 0 insertions, 0 deletions