diff mbox

[FFmpeg-devel,09/17] ffserver.c: simplify cleanup in run_server()

Message ID 20180628005117.18902-10-klaxa1337@googlemail.com
State New
Headers show

Commit Message

Stephan Holljes June 28, 2018, 12:51 a.m. UTC 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
---
 ffserver.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
diff mbox

Patch

diff --git a/ffserver.c b/ffserver.c
index cc7dc6c..f128b55 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -646,18 +646,10 @@  end:
         }
         av_free(winfos_p[stream_index]);
         av_free(w_threads_p[stream_index]);
-        // pubs[stream_index] could be null if the file could not be opened
+        // pubs[stream_index] could be null if the file could not be opened or mkv was not requested
         if (pubs[stream_index])
             publisher_free(pubs[stream_index]);
     }
-    av_free(rinfos);
-    av_free(winfos_p);
-    av_free(r_threads);
-    av_free(w_threads_p);
-    av_free(pubs);
-    av_free(ifmt_ctxs);
-
-    return NULL;
 
 error_cleanup:
     av_free(rinfos);