aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-24 23:33:40 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-09-20 17:46:41 +0200
commitf93f739ecac035cea7cede78dabbdb3a35628c77 (patch)
tree2625e1cb05fa7136e03d0983b171bc07f1002cf8
parent1a6218954a35a7a30e1d7910af30e0bf3f1c55dd (diff)
downloadffmpeg-f93f739ecac035cea7cede78dabbdb3a35628c77.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 7ffe6c6524..ff89324248 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -357,6 +357,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;