diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-10 14:07:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-10 14:07:27 +0100 |
| commit | f2b89f21cc3dfcfda911e621c3ea62f3175eacbe (patch) | |
| tree | 984cf3d1534a4ef08d645f8b467ac6cb6ce44a1b /libavcodec/jpeglsdec.h | |
| parent | 0b1896543446491ed3d28aea82e3f990ec514c65 (diff) | |
| parent | 7b41c24c5fa221b55a9302efaf1a9eeb38b12551 (diff) | |
| download | ffmpeg-f2b89f21cc3dfcfda911e621c3ea62f3175eacbe.tar.gz | |
Merge commit '7b41c24c5fa221b55a9302efaf1a9eeb38b12551'
* commit '7b41c24c5fa221b55a9302efaf1a9eeb38b12551':
sws: dont enable chrSrcHSubSample for planar RGB
Conflicts:
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeglsdec.h')
0 files changed, 0 insertions, 0 deletions