[FFmpeg-cvslog] ffserver: Throw ffm.h out its not used except for a constant that is part of the format

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri Oct 28 18:36:53 2016 +0200| [f67d22f0fd6bbb70949a939e282f78d13b36aaa3] | committer: Michael Niedermayer

ffserver: Throw ffm.h out its not used except for a constant that is part of the format

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 ffserver.c        | 1 -
 ffserver_config.c | 3 ---
 ffserver_config.h | 2 ++
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ffserver.c b/ffserver.c
index cfb1a6c..c16f8aa 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -32,7 +32,6 @@
 #include <stdio.h>
 #include "libavformat/avformat.h"
 /* FIXME: those are internal headers, ffserver _really_ shouldn't use them */
-#include "libavformat/ffm.h"
 #include "libavformat/rtpproto.h"
 #include "libavformat/rtsp.h"
 #include "libavformat/avio_internal.h"
diff --git a/ffserver_config.c b/ffserver_config.c
index 0ec93b5..99709b5 100644
--- 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"
 
diff --git a/ffserver_config.h b/ffserver_config.h
index 1b12194..0bd4cfc 100644
--- a/ffserver_config.h
+++ b/ffserver_config.h
@@ -21,6 +21,8 @@
 #ifndef FFSERVER_CONFIG_H
 #define FFSERVER_CONFIG_H
 
+#define FFM_PACKET_SIZE 4096
+
 #include "libavutil/dict.h"
 #include "libavformat/avformat.h"
 #include "libavformat/network.h"