From 990c2ee3bd950f3b7d447cd71fa5efc979d1c98a Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 15 May 2015 15:23:32 +0200
Subject: [PATCH] avcodec/proresdec2: Reset slice_count on deallocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c4c6aea397f62421bf8ef0449b2b465a53e4ab4d)

Conflicts:

	libavcodec/proresdec2.c
---
 libavcodec/proresdec2.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c
index 5037bb8e02..a9f6e20f3a 100644
--- a/libavcodec/proresdec2.c
+++ b/libavcodec/proresdec2.c
@@ -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);