ffmpeg | branch: release/2.2 | Michael Niedermayer <michae...@gmx.at> | Fri May
15 15:23:32 2015 +0200| [cd489b8f6469aac8abeee26b495d6c93b3805df3] | committer:
Michael Niedermayer
avcodec/proresdec2: Reset slice_count on deallocation
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
(cherry picked from commit c4c6aea397f62421bf8ef0449b2b465a53e4ab4d)
Conflicts:
libavcodec/proresdec2.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cd489b8f6469aac8abeee26b495d6c93b3805df3
---
libavcodec/proresdec2.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c
index b1affad..54ef9de 100644
--- a/libavcodec/proresdec2.c
+++ b/libavcodec/proresdec2.c
@@ -182,6 +182,7 @@ static int decode_picture_header(AVCodecContext *avctx,
const uint8_t *buf, cons
if (ctx->slice_count != slice_count || !ctx->slices) {
av_freep(&ctx->slices);
+ ctx->slice_count = 0;
ctx->slices = av_mallocz(slice_count * sizeof(*ctx->slices));
if (!ctx->slices)
return AVERROR(ENOMEM);
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
