diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 03:20:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 03:36:38 +0200 |
| commit | ed962414bd66027ce67ded912c17e08970163f52 (patch) | |
| tree | 27a07264d5e7d5194c9a2df07882b8cdb75790a3 /libswscale/swscale_internal.h | |
| parent | 0a1cc04e6c09295cf06a1ca96d9a5a6e8bd85acb (diff) | |
| parent | 92b099daf4b8ef93513e38b43899cb8458a2fde3 (diff) | |
| download | ffmpeg-streaming-ed962414bd66027ce67ded912c17e08970163f52.zip ffmpeg-streaming-ed962414bd66027ce67ded912c17e08970163f52.tar.gz | |
Merge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3'
* commit '92b099daf4b8ef93513e38b43899cb8458a2fde3':
swscale: support converting YVYU422 pixel format
Conflicts:
libswscale/input.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale_internal.h')
| -rw-r--r-- | libswscale/swscale_internal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 921b892..0b3e687 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -783,6 +783,7 @@ static av_always_inline int isALPHA(enum AVPixelFormat pix_fmt) #define isPacked(x) ( \ (x)==AV_PIX_FMT_PAL8 \ || (x)==AV_PIX_FMT_YUYV422 \ + || (x)==AV_PIX_FMT_YVYU422 \ || (x)==AV_PIX_FMT_UYVY422 \ || (x)==AV_PIX_FMT_Y400A \ || isRGBinInt(x) \ |
