avcodec/mpeg12dec: clear mpeg_enc_ctx_allocated when contexts are deallocated

Fixes Ticket2950

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/36/head
Michael Niedermayer 11 years ago
parent 6c07e41f43
commit 108b91c3fe
  1. 2
      libavcodec/mpeg12dec.c

@ -1211,6 +1211,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx)
s->parse_context.buffer = 0; s->parse_context.buffer = 0;
ff_MPV_common_end(s); ff_MPV_common_end(s);
s->parse_context = pc; s->parse_context = pc;
s1->mpeg_enc_ctx_allocated = 0;
} }
if ((s->width == 0) || (s->height == 0)) if ((s->width == 0) || (s->height == 0))
@ -2035,6 +2036,7 @@ static int vcr2_init_sequence(AVCodecContext *avctx)
s->out_format = FMT_MPEG1; s->out_format = FMT_MPEG1;
if (s1->mpeg_enc_ctx_allocated) { if (s1->mpeg_enc_ctx_allocated) {
ff_MPV_common_end(s); ff_MPV_common_end(s);
s1->mpeg_enc_ctx_allocated = 0;
} }
s->width = avctx->coded_width; s->width = avctx->coded_width;
s->height = avctx->coded_height; s->height = avctx->coded_height;

Loading…
Cancel
Save