diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-11 02:07:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-11 02:07:08 +0200 |
| commit | 0f88a98b43b8ae41529a15c52b35b5d1bbef3197 (patch) | |
| tree | 0cd2a7731202a0cf3513ad606910eeefb9baa1db | |
| parent | 175e916fa20b7887bdb29809817985e481ae0888 (diff) | |
| parent | 7800b09ece52490dda4c46fbd8e93f92e8438428 (diff) | |
| download | ffmpeg-0f88a98b43b8ae41529a15c52b35b5d1bbef3197.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Check more completely for invalid pix_fmts in planarRgb16ToRgb16Wrapper()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libswscale/swscale_unscaled.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 774c655628..3b07800d02 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -495,7 +495,8 @@ static int planarRgb16ToRgb16Wrapper(SwsContext *c, const uint8_t *src[], swap += 2; if ((src_format->flags & (AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB)) != - (AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB)) { + (AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB) || + bits_per_sample <= 8) { av_log(c, AV_LOG_ERROR, "unsupported planar RGB conversion %s -> %s\n", src_format->name, dst_format->name); return srcSliceH; |