[MPlayer-cvslog] r36519 - trunk/libmpcodecs/vd_ffmpeg.c

[reimar]

Author: reimar
Date: Tue Nov 19 19:10:47 2013
New Revision: 36519

Log:
Avoid resetting fields when we will never have set them in the first place.

Should avoid memleak issues with h264_vda.
Untested, and h264_vda should not preferably be changed in FFmpeg
to not expose such details of its implementation.

Modified:
   trunk/libmpcodecs/vd_ffmpeg.c

Modified: trunk/libmpcodecs/vd_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/vd_ffmpeg.c	Tue Nov 19 12:03:11 2013	(r36518)
+++ trunk/libmpcodecs/vd_ffmpeg.c	Tue Nov 19 19:10:47 2013	(r36519)
@@ -272,7 +272,7 @@ static void set_dr_slice_settings(struct
         avctx->  reget_buffer =
         avctx->    get_buffer =     get_buffer;
         avctx->release_buffer = release_buffer;
-    } else {
+    } else if (lavc_codec->capabilities & CODEC_CAP_DR1) {
         avctx->flags &= ~CODEC_FLAG_EMU_EDGE;
         avctx->  reget_buffer = avcodec_default_reget_buffer;
         avctx->    get_buffer = avcodec_default_get_buffer;