diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 00:33:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 00:33:27 +0200 |
| commit | 700bf1fa4e783ec078615f3b13dfad979f4d2ccf (patch) | |
| tree | 57b4e7db75a27cf41696d8f24eb4fd8248dc869d | |
| parent | 8f83fb99912fa834ff2081ca876ca05116aab263 (diff) | |
| download | ffmpeg-700bf1fa4e783ec078615f3b13dfad979f4d2ccf.tar.gz | |
swscale/swscale_unscaled: fix ya16 input
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libswscale/swscale_unscaled.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 0c0edd1efb..da457dfbdb 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -1730,7 +1730,7 @@ void ff_get_unscaled_swscale(SwsContext *c) if (srcFormat == AV_PIX_FMT_UYVY422 && dstFormat == AV_PIX_FMT_YUV422P) c->swscale = uyvyToYuv422Wrapper; -#define isPlanarGray(x) (isGray(x) && (x) != AV_PIX_FMT_YA8) +#define isPlanarGray(x) (isGray(x) && (x) != AV_PIX_FMT_YA8 && (x) != AV_PIX_FMT_YA16LE && (x) != AV_PIX_FMT_YA16BE) /* simple copy */ if ( srcFormat == dstFormat || (srcFormat == AV_PIX_FMT_YUVA420P && dstFormat == AV_PIX_FMT_YUV420P) || |