aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-24 23:33:40 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-30 21:33:09 +0200
commit0bf0de718524cb6025a6568c46f3296acdd4fd5a (patch)
tree0e4509a87d1d32faa2e4dd30db8b507ec476e4b7
parentc58d7f9eb56abc4c90d98011c23a4a031077af4e (diff)
downloadffmpeg-0bf0de718524cb6025a6568c46f3296acdd4fd5a.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 c25d6412c6..4bf0392687 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -234,6 +234,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;