aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-19 18:37:49 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-19 18:38:39 +0200
commitc1bc20bfd9f6ab2d2a3342a924938185404d7a4f (patch)
treeb1216104b2e67e945ee9119c241e72f6cda05cc1
parent6ca0a976b2e68c9aa36d2e0806d31eee66d9f482 (diff)
parent6ef96292d99302a59f824713fc763f6abd3754df (diff)
downloadffmpeg-c1bc20bfd9f6ab2d2a3342a924938185404d7a4f.tar.gz
Merge commit '6ef96292d99302a59f824713fc763f6abd3754df'
* commit '6ef96292d99302a59f824713fc763f6abd3754df': utils: add yvyu422 to avcodec_align_dimensions2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/utils.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 24319cc2e9..ad1aae677a 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -285,6 +285,7 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
switch (s->pix_fmt) {
case AV_PIX_FMT_YUV420P:
case AV_PIX_FMT_YUYV422:
+ case AV_PIX_FMT_YVYU422:
case AV_PIX_FMT_UYVY422:
case AV_PIX_FMT_YUV422P:
case AV_PIX_FMT_YUV440P: