aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-11-30 18:45:33 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-11-30 18:45:33 +0100
commitfd3e75d2d461725ffd0f5f86a7710062d6c7956c (patch)
tree50bfff497f388e39bc4c88f8e8cdaec83ddad359
parent8d5078c10b0e2f813f00bd799ed7aab968707689 (diff)
downloadffmpeg-fd3e75d2d461725ffd0f5f86a7710062d6c7956c.tar.gz
lavc: horizontal align for IFF
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/utils.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 979b27a809..a601ec8920 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -203,6 +203,10 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, int l
break;
}
+ if(s->codec_id == CODEC_ID_IFF_ILBM || s->codec_id == CODEC_ID_IFF_BYTERUN1){
+ w_align= FFMAX(w_align, 8);
+ }
+
*width = FFALIGN(*width , w_align);
*height= FFALIGN(*height, h_align);
if(s->codec_id == CODEC_ID_H264 || s->lowres)