aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/utils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-15 05:35:00 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-15 05:45:48 +0100
commit5edbd4f4106fcff571c3f2c5a1f89534b5bd0307 (patch)
tree712e4de8911f2bbdbe54578f8b69db52d739818e /libavcodec/utils.c
parentada0fc4efa2502c901310faef6b63349e8b6bd6a (diff)
parent9a4aaae3b29392b6d74997e06be249d7d54a7394 (diff)
downloadffmpeg-5edbd4f4106fcff571c3f2c5a1f89534b5bd0307.tar.gz
Merge commit '9a4aaae3b29392b6d74997e06be249d7d54a7394'
* commit '9a4aaae3b29392b6d74997e06be249d7d54a7394': lavc: add GBRAP to avcodec_align_dimensions2 See: 5c057433ccd32f37ddc828d3f82c5b1ad7d3e3db Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r--libavcodec/utils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 1ec5caed82..e18ed2d751 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -297,8 +297,8 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
case AV_PIX_FMT_YUV422P:
case AV_PIX_FMT_YUV440P:
case AV_PIX_FMT_YUV444P:
- case AV_PIX_FMT_GBRAP:
case AV_PIX_FMT_GBRP:
+ case AV_PIX_FMT_GBRAP:
case AV_PIX_FMT_GRAY8:
case AV_PIX_FMT_GRAY16BE:
case AV_PIX_FMT_GRAY16LE: