Merge commit '582d4211e00015b68626f77ce4af53161e2b1713'

[ffmpeg] / ffserver_config.c

diff --git a/ffserver_config.c b/ffserver_config.c
index 0ec93b5fda27b1f9565d462b6609965c21f5a407..99709b54c70c1182c11f09622fd90e90bd46c439 100644 (file)
--- a/ffserver_config.c
+++ b/ffserver_config.c
@@ -25,9 +25,6 @@
 #include "libavutil/pixdesc.h"
 #include "libavutil/avassert.h"
 
-// FIXME those are internal headers, ffserver _really_ shouldn't use them
-#include "libavformat/ffm.h"
-
 #include "cmdutils.h"
 #include "ffserver_config.h"