[FFmpeg-cvslog] avcodec/mpeg12dec: clear mpeg_enc_ctx_allocated when contexts are deallocated

Michael Niedermayer git at videolan.org
Sat Sep 14 00:42:29 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Sep 14 00:31:40 2013 +0200| [108b91c3fe61f5296585a1e326e85f0f18576ad6] | committer: Michael Niedermayer

avcodec/mpeg12dec: clear mpeg_enc_ctx_allocated when contexts are deallocated

Fixes Ticket2950

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=108b91c3fe61f5296585a1e326e85f0f18576ad6
---

 libavcodec/mpeg12dec.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 3df8bf7..b008708 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -1211,6 +1211,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx)
             s->parse_context.buffer = 0;
             ff_MPV_common_end(s);
             s->parse_context = pc;
+            s1->mpeg_enc_ctx_allocated = 0;
         }
 
         if ((s->width == 0) || (s->height == 0))
@@ -2035,6 +2036,7 @@ static int vcr2_init_sequence(AVCodecContext *avctx)
     s->out_format = FMT_MPEG1;
     if (s1->mpeg_enc_ctx_allocated) {
         ff_MPV_common_end(s);
+        s1->mpeg_enc_ctx_allocated = 0;
     }
     s->width  = avctx->coded_width;
     s->height = avctx->coded_height;



More information about the ffmpeg-cvslog mailing list