Module: libav
Branch: master
Commit: 37c0dc626d2f8254ef623d987eb5077f9120755f
Author: Rafaël Carré <fun...@videolan.org>
Committer: Luca Barbato <lu_z...@gentoo.org>
Date: Tue Dec 13 15:32:34 2011 +0100
lavc: always align height by 32 pixel
Interlaced content for most codec requires it.
This patch is a stop-gap pending a serious rework to support
codecs with non 16 pixel macroblocks.
Signed-off-by: Luca Barbato <lu_z...@gentoo.org>
---
libavcodec/utils.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 9d17ee4..20b01f5 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -166,10 +166,8 @@ void avcodec_align_dimensions2(AVCodecContext *s, int
*width, int *height,
case PIX_FMT_GBRP9BE:
case PIX_FMT_GBRP10LE:
case PIX_FMT_GBRP10BE:
- 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)
- h_align= 32; // interlaced is rounded up to 2 MBs
+ w_align = 16; //FIXME assume 16 pixel per macroblock
+ h_align = 16 * 2; // interlaced needs 2 macroblocks height
break;
case PIX_FMT_YUV411P:
case PIX_FMT_UYYVYY411:
_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
