From: Anton Khirnov <anton@khirnov.net>
Date: Tue, 11 Aug 2015 13:00:24 +0000 (+0200)
Subject: examples/qsvdec: free the lavc decoder before closing MFX/VAAPI
X-Git-Tag: android-x86-7.1-r1~252^2~1959
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=539e5ac2ecfec2e2f441222a43fb0583643ea607;p=android-x86%2Fexternal-ffmpeg.git

examples/qsvdec: free the lavc decoder before closing MFX/VAAPI

lavc expects MFX to still be in a usable state on close.
---

diff --git a/doc/examples/qsvdec.c b/doc/examples/qsvdec.c
index 2f26f41ebd..fd934bebd3 100644
--- a/doc/examples/qsvdec.c
+++ b/doc/examples/qsvdec.c
@@ -468,6 +468,10 @@ finish:
 
     av_frame_free(&frame);
 
+    if (decoder_ctx)
+        av_freep(&decoder_ctx->hwaccel_context);
+    avcodec_free_context(&decoder_ctx);
+
     free_surfaces(&decode);
 
     if (decode.mfx_session)
@@ -477,10 +481,6 @@ finish:
     if (dpy)
         XCloseDisplay(dpy);
 
-    if (decoder_ctx)
-        av_freep(&decoder_ctx->hwaccel_context);
-    avcodec_free_context(&decoder_ctx);
-
     avio_close(output_ctx);
 
     return ret;