aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-06-10 15:38:26 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2016-08-13 13:08:57 +0200
commit679e869496ede3cd17369b46e815d3a47458cab4 (patch)
tree4ddcabe6fd2298c3667c61babf2054ba6b69432f
parent7216068e42554575ef052c2dec4a3291ac04d68f (diff)
downloadandroid_external_ffmpeg-679e869496ede3cd17369b46e815d3a47458cab4.tar.gz
android_external_ffmpeg-679e869496ede3cd17369b46e815d3a47458cab4.tar.bz2
android_external_ffmpeg-679e869496ede3cd17369b46e815d3a47458cab4.zip
avcodec/mpegvideo: Do not clear the parse context during init
It is allocated before, this cannot work Fixes Ticket5613 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 24f513619680b5bef40b02db6ca07a8a009c2ece) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/mpegvideo.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 798b517ec5..f660a1cbec 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -822,9 +822,7 @@ static void clear_context(MpegEncContext *s)
s->sc.b_scratchpad =
s->sc.obmc_scratchpad = NULL;
- s->parse_context.buffer = NULL;
- s->parse_context.buffer_size = 0;
- s->parse_context.overread = 0;
+
s->bitstream_buffer = NULL;
s->allocated_bitstream_buffer_size = 0;
s->picture = NULL;