avcodec/proresdec2: Reset slice_count on deallocation
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 15 May 2015 13:23:32 +0000 (15:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Jun 2015 00:13:11 +0000 (02:13 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c4c6aea397f62421bf8ef0449b2b465a53e4ab4d)

Conflicts:

libavcodec/proresdec2.c

libavcodec/proresdec2.c

index 5037bb8..a9f6e20 100644 (file)
@@ -202,6 +202,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);