aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Garrett-Glaser <jason@x264.com>2011-06-28 18:22:23 -0700
committerReinhard Tartler <siretart@tauware.de>2011-06-29 19:46:14 +0200
commit87eedf69433d95a40830a98bb2d656a04dfd4609 (patch)
tree2f401ea050f7c90242a6980dde4271d9d86a3510
parente54fd33848355202c03edb3ebfcdb53b1d71c2ce (diff)
downloadffmpeg-87eedf69433d95a40830a98bb2d656a04dfd4609.tar.gz
Add new yuv444 pixfmts to avcodec_align_dimensions2
Fixes draw_edges crashes with high-bit-depth 4:4:4 decoding. (cherry picked from commit da55ee6ccc05efdd9006bb8c31db9012a3326857) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
-rw-r--r--libavcodec/utils.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 1e5886473d..c32fda26ec 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -142,6 +142,10 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, int l
case PIX_FMT_YUV420P10BE:
case PIX_FMT_YUV422P10LE:
case PIX_FMT_YUV422P10BE:
+ case PIX_FMT_YUV444P9LE:
+ case PIX_FMT_YUV444P9BE:
+ case PIX_FMT_YUV444P10LE:
+ case PIX_FMT_YUV444P10BE:
w_align= 16; //FIXME check for non mpeg style codecs and use less alignment
h_align= 16;
if(s->codec_id == CODEC_ID_MPEG2VIDEO || s->codec_id == CODEC_ID_MJPEG || s->codec_id == CODEC_ID_AMV || s->codec_id == CODEC_ID_THP || s->codec_id == CODEC_ID_H264)