diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 03:07:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 03:07:47 +0200 |
| commit | 0a1cc04e6c09295cf06a1ca96d9a5a6e8bd85acb (patch) | |
| tree | ac4bfa3f2e2fa0c0a7766633650516e0ac4247ef /libavutil/pixdesc.c | |
| parent | 352e13e2a9914c623fc53fab3ff49a21e9232674 (diff) | |
| parent | 8b17243d1742279bcb2368f8d325ea71e66736c8 (diff) | |
| download | ffmpeg-0a1cc04e6c09295cf06a1ca96d9a5a6e8bd85acb.tar.gz | |
Merge commit '8b17243d1742279bcb2368f8d325ea71e66736c8'
* commit '8b17243d1742279bcb2368f8d325ea71e66736c8':
lavu: Add packed YVYU422 pixel format
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/pixdesc.c')
| -rw-r--r-- | libavutil/pixdesc.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 45889727ca..036481aa7a 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -154,6 +154,17 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 3, 4, 0, 7 }, /* V */ }, }, + [AV_PIX_FMT_YVYU422] = { + .name = "yvyu422", + .nb_components = 3, + .log2_chroma_w = 1, + .log2_chroma_h = 0, + .comp = { + { 0, 1, 1, 0, 7 }, /* Y */ + { 0, 3, 2, 0, 7 }, /* V */ + { 0, 3, 4, 0, 7 }, /* U */ + }, + }, [AV_PIX_FMT_RGB24] = { .name = "rgb24", .nb_components = 3, |