From: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Date: Tue, 3 May 2016 09:23:58 +0000 (+0100)
Subject: Merge commit '21b746932241246be846a133abb3c5f91b1cab85'
X-Git-Tag: android-x86-7.1-r1~5400
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=014fb816d104fef876f7044c0f6876e890c93c0a;p=android-x86%2Fexternal-ffmpeg.git

Merge commit '21b746932241246be846a133abb3c5f91b1cab85'

* commit '21b746932241246be846a133abb3c5f91b1cab85':
  svq3: eliminate H264Context.cur_pic usage

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
---

014fb816d104fef876f7044c0f6876e890c93c0a
diff --cc libavcodec/svq3.c
index 5f8f807325,48561cceda..fd43e84ab2
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@@ -1638,13 -1579,8 +1635,11 @@@ static av_cold int svq3_decode_end(AVCo
      av_freep(&s->edge_emu_buffer);
      av_freep(&s->mb2br_xy);
  
-     memset(&h->cur_pic, 0, sizeof(h->cur_pic));
- 
      ff_h264_free_context(h);
  
 +    av_freep(&s->buf);
 +    s->buf_size = 0;
 +
      return 0;
  }