On Sunday 25 October 2015 01:37:15 pm Carl Eugen Hoyos wrote:
> Hi!
>
> Attached patch intends to fix an issue reported by forum user Koracas:
> For slice_count > 0x10000 FFmpeg fails to decode a frame, QT seems to
> ignore the value.
New patch attached.
Please comment, Carl Eugen
diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c
index 932f85f..2d47a13 100644
--- a/libavcodec/proresdec2.c
+++ b/libavcodec/proresdec2.c
@@ -180,7 +180,10 @@ static int decode_picture_header(AVCodecContext *avctx,
const uint8_t *buf, cons
else
ctx->mb_height = (avctx->height + 15) >> 4;
- slice_count = AV_RB16(buf + 5);
+ // QT ignores the written value
+ // slice_count = AV_RB16(buf + 5);
+ slice_count = ctx->mb_height * ((ctx->mb_width >> log2_slice_mb_width) +
+ av_popcount(ctx->mb_width & (1 <<
log2_slice_mb_width) - 1));
if (ctx->slice_count != slice_count || !ctx->slices) {
av_freep(&ctx->slices);
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
