aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-07-03 04:10:52 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-07-03 19:03:40 +0200
commit6ea973fc4c959f8f0fcbf3d2f75cc7371b4ecaee (patch)
tree28877d91b86a47a8002ad2f09f5ad9ab0ef9d902
parent4251a0b84ce4745048ced24057726c65b926e6b4 (diff)
downloadffmpeg-6ea973fc4c959f8f0fcbf3d2f75cc7371b4ecaee.tar.gz
avcodec_align_dimensions2: support 12 & 14 bit planar colorspaces
Reviewed-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/utils.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index c2ccd8f6c5..3d4b0c7467 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -185,18 +185,34 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
case PIX_FMT_YUV420P9BE:
case PIX_FMT_YUV420P10LE:
case PIX_FMT_YUV420P10BE:
+ case PIX_FMT_YUV420P12LE:
+ case PIX_FMT_YUV420P12BE:
+ case PIX_FMT_YUV420P14LE:
+ case PIX_FMT_YUV420P14BE:
case PIX_FMT_YUV422P9LE:
case PIX_FMT_YUV422P9BE:
case PIX_FMT_YUV422P10LE:
case PIX_FMT_YUV422P10BE:
+ case PIX_FMT_YUV422P12LE:
+ case PIX_FMT_YUV422P12BE:
+ case PIX_FMT_YUV422P14LE:
+ case PIX_FMT_YUV422P14BE:
case PIX_FMT_YUV444P9LE:
case PIX_FMT_YUV444P9BE:
case PIX_FMT_YUV444P10LE:
case PIX_FMT_YUV444P10BE:
+ case PIX_FMT_YUV444P12LE:
+ case PIX_FMT_YUV444P12BE:
+ case PIX_FMT_YUV444P14LE:
+ case PIX_FMT_YUV444P14BE:
case PIX_FMT_GBRP9LE:
case PIX_FMT_GBRP9BE:
case PIX_FMT_GBRP10LE:
case PIX_FMT_GBRP10BE:
+ case PIX_FMT_GBRP12LE:
+ case PIX_FMT_GBRP12BE:
+ case PIX_FMT_GBRP14LE:
+ case PIX_FMT_GBRP14BE:
w_align = 16; //FIXME assume 16 pixel per macroblock
h_align = 16 * 2; // interlaced needs 2 macroblocks height
break;