Merge commit '9295d10ea9d138462b7f67d16bf95ae9ca76aca6'

[ffmpeg] / libavformat / mux.c

diff --git a/libavformat/mux.c b/libavformat/mux.c
index adf817112e2d3d1f414ec4fb750929851927cb0b..050c4d94113a3180d252e2fe9d35426fc0dc6490 100644 (file)
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -44,9 +44,6 @@
 #include "network.h"
 #endif
 
-#undef NDEBUG
-#include <assert.h>
-
 /**
  * @file
  * muxing functions for use within libavformat