diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-15 15:23:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-17 21:50:07 +0200 |
| commit | cd489b8f6469aac8abeee26b495d6c93b3805df3 (patch) | |
| tree | 8b2b52cb1cb893d4c186a00822e166b2bf017acd | |
| parent | f8f24d5dbdf9d3dd167ae272700f3f292211edd7 (diff) | |
| download | ffmpeg-cd489b8f6469aac8abeee26b495d6c93b3805df3.tar.gz | |
avcodec/proresdec2: Reset slice_count on deallocation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c4c6aea397f62421bf8ef0449b2b465a53e4ab4d)
Conflicts:
libavcodec/proresdec2.c
| -rw-r--r-- | libavcodec/proresdec2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c index b1affadaac..54ef9de6ce 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); |