aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/utils.c
diff options
context:
space:
mode:
authorElvis Presley <elvis@e.p>2011-09-15 05:50:44 +0200
committerElvis Presley <elvis@e.p>2011-09-15 15:58:56 +0200
commit5554de13b29b9bb812ee5cfd606349873ddf0945 (patch)
treec23bbd0e2d658dd70d118261326be9c53b63127f /libavcodec/utils.c
parentd55b06b8e725b9ef362137486221fa1e90c012c0 (diff)
downloadffmpeg-5554de13b29b9bb812ee5cfd606349873ddf0945.tar.gz
ProRes Decoder
Signed-off-by: Elvis Presley <elvis@e.p>
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r--libavcodec/utils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index da12dda3fc..068d7272f6 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -149,7 +149,7 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, int l
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)
+ 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 || s->codec_id == CODEC_ID_PRORES)
h_align= 32; // interlaced is rounded up to 2 MBs
break;
case PIX_FMT_YUV411P: