[FFmpeg-cvslog] dshow: remove filters from graph before releasing them

[Ramiro Polla]

ffmpeg | branch: master | Ramiro Polla <ramiro.polla at gmail.com> | Tue Sep 13 14:56:28 2011 -0300| [6613db9736605a98927b1d3290b1175d4f79e55e] | committer: Stefano Sabatini

dshow: remove filters from graph before releasing them

Signed-off-by: Stefano Sabatini <stefasab at gmail.com>

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

 libavdevice/dshow.c |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c
index 5fa9000..a9d400c 100644
--- a/libavdevice/dshow.c
+++ b/libavdevice/dshow.c
@@ -112,6 +112,22 @@ dshow_read_close(AVFormatContext *s)
         IMediaControl_Release(ctx->control);
     }
 
+    if (ctx->graph) {
+        IEnumFilters *fenum;
+        int r;
+        r = IGraphBuilder_EnumFilters(ctx->graph, &fenum);
+        if (r == S_OK) {
+            IBaseFilter *f;
+            IEnumFilters_Reset(fenum);
+            while (IEnumFilters_Next(fenum, 1, &f, NULL) == S_OK)
+                if (IGraphBuilder_RemoveFilter(ctx->graph, f) == S_OK)
+                    IEnumFilters_Reset(fenum); /* When a filter is removed,
+                                                * the list must be reset. */
+            IEnumFilters_Release(fenum);
+        }
+        IGraphBuilder_Release(ctx->graph);
+    }
+
     if (ctx->capture_pin[VideoDevice])
         libAVPin_Release(ctx->capture_pin[VideoDevice]);
     if (ctx->capture_pin[AudioDevice])
@@ -130,22 +146,6 @@ dshow_read_close(AVFormatContext *s)
     if (ctx->device_filter[AudioDevice])
         IBaseFilter_Release(ctx->device_filter[AudioDevice]);
 
-    if (ctx->graph) {
-        IEnumFilters *fenum;
-        int r;
-        r = IGraphBuilder_EnumFilters(ctx->graph, &fenum);
-        if (r == S_OK) {
-            IBaseFilter *f;
-            IEnumFilters_Reset(fenum);
-            while (IEnumFilters_Next(fenum, 1, &f, NULL) == S_OK)
-                if (IGraphBuilder_RemoveFilter(ctx->graph, f) == S_OK)
-                    IEnumFilters_Reset(fenum); /* When a filter is removed,
-                                                * the list must be reset. */
-            IEnumFilters_Release(fenum);
-        }
-        IGraphBuilder_Release(ctx->graph);
-    }
-
     if (ctx->device_name[0])
         av_free(ctx->device_name[0]);
     if (ctx->device_name[1])