diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-06 21:47:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-06 21:48:03 +0200 |
| commit | b3e9fd1fe5786672c5d53e91f518419d05598ea4 (patch) | |
| tree | fe6ae75d7965ec56508cea805671b321ad3b7d38 /libavformat/img2dec.c | |
| parent | 050b48f39783d7af05fc805fc4278a97941e7436 (diff) | |
| parent | 6e293d111fcad27d52a2ef5ad77b1009f1743396 (diff) | |
| download | ffmpeg-b3e9fd1fe5786672c5d53e91f518419d05598ea4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swscale: Use alpha from the right row in yuva2rgba_c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/img2dec.c')
0 files changed, 0 insertions, 0 deletions