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/utils.c | |
parent | 0a1cc04e6c09295cf06a1ca96d9a5a6e8bd85acb (diff) | |
parent | 92b099daf4b8ef93513e38b43899cb8458a2fde3 (diff) | |
download | ffmpeg-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/utils.c')
-rw-r--r-- | libswscale/utils.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c index 7680dbfa49..b3e117f70e 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -97,6 +97,7 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = { [AV_PIX_FMT_YUVJ411P] = { 1, 1 }, [AV_PIX_FMT_YUVJ422P] = { 1, 1 }, [AV_PIX_FMT_YUVJ444P] = { 1, 1 }, + [AV_PIX_FMT_YVYU422] = { 1, 1 }, [AV_PIX_FMT_UYVY422] = { 1, 1 }, [AV_PIX_FMT_UYYVYY411] = { 0, 0 }, [AV_PIX_FMT_BGR8] = { 1, 1 }, |