[FFmpeg-cvslog] Merge commit 'c80344d0101558098a6cd2ed5082ff5fda7ca18b'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Mon Apr 11 16:02:08 2016 +0100| [95348174ef87b67f14609334ef177fe9e75c48c1] | committer: Derek Buitenhuis

Merge commit 'c80344d0101558098a6cd2ed5082ff5fda7ca18b'

* commit 'c80344d0101558098a6cd2ed5082ff5fda7ca18b':
  mpegvideo_enc: use avcodec_free_context() instead of av_free()

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

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

 libavcodec/mpegvideo_enc.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 297ff78..f8de028 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -1518,8 +1518,7 @@ static int estimate_best_b_count(MpegEncContext *s)
         }
     }
 
-    avcodec_close(c);
-    av_freep(&c);
+    avcodec_free_context(&c);
 
     return best_b_count;
 }


======================================================================