Merge commit 'c80344d0101558098a6cd2ed5082ff5fda7ca18b'

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

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

libavcodec/mpegvideo_enc.c

@@ -1518,8 +1518,7 @@ static int estimate_best_b_count(MpegEncContext *s)
         }
     }
 
-    avcodec_close(c);
+    avcodec_free_context(&c);
-    av_freep(&c);
 
     return best_b_count;
 }