diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 16:28:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 16:44:11 +0200 |
| commit | 5b2f9790e6eb8440b6ff470cc4b43b155726884b (patch) | |
| tree | 721287f132e634ed755819b9b29f329d2e636e7d /libavcodec | |
| parent | eaa86850336a9070012957a4643f9cbc69d61c9a (diff) | |
| download | ffmpeg-5b2f9790e6eb8440b6ff470cc4b43b155726884b.tar.gz | |
avcodec/jpeg2000dec: Fallback to yuv if no matching xyz format exists
Fixes Ticket4471
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 430a386f8c..940fac3cd1 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -220,7 +220,8 @@ static int pix_fmt_match(enum AVPixelFormat pix_fmt, int components, static const enum AVPixelFormat rgb_pix_fmts[] = {RGB_PIXEL_FORMATS}; static const enum AVPixelFormat gray_pix_fmts[] = {GRAY_PIXEL_FORMATS}; static const enum AVPixelFormat yuv_pix_fmts[] = {YUV_PIXEL_FORMATS}; -static const enum AVPixelFormat xyz_pix_fmts[] = {XYZ_PIXEL_FORMATS}; +static const enum AVPixelFormat xyz_pix_fmts[] = {XYZ_PIXEL_FORMATS, + YUV_PIXEL_FORMATS}; static const enum AVPixelFormat all_pix_fmts[] = {RGB_PIXEL_FORMATS, GRAY_PIXEL_FORMATS, YUV_PIXEL_FORMATS, |