aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-24 23:33:40 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-11-28 18:44:37 +0100
commitcb8f645fafec180b3cdba23838dc9340c0faef11 (patch)
tree9d7011c8a86ddc1e47a5d6b700941a3cd09b7371
parent6ab793c2b9bbe1196f9b8af2dd66eef55e631605 (diff)
downloadffmpeg-cb8f645fafec180b3cdba23838dc9340c0faef11.tar.gz
avcodec/utils: add GBRP16 to avcodec_align_dimensions2()
Fixes Ticket3869 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3fe9e7be4c70c8fccdcd56fd19276e668cfb7de8) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/utils.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index c343bf1caf..8b50c45d66 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -327,6 +327,8 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
case AV_PIX_FMT_GBRP12BE:
case AV_PIX_FMT_GBRP14LE:
case AV_PIX_FMT_GBRP14BE:
+ case AV_PIX_FMT_GBRP16LE:
+ case AV_PIX_FMT_GBRP16BE:
w_align = 16; //FIXME assume 16 pixel per macroblock
h_align = 16 * 2; // interlaced needs 2 macroblocks height
break;