diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-10-28 18:36:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-11-07 19:27:40 +0100 |
| commit | f67d22f0fd6bbb70949a939e282f78d13b36aaa3 (patch) | |
| tree | 0e7017025533badab4736e113a36e42eab9270ef | |
| parent | 4c8d69e534f168fdf0358e2f409c6c3694eacd12 (diff) | |
| download | ffmpeg-f67d22f0fd6bbb70949a939e282f78d13b36aaa3.tar.gz | |
ffserver: Throw ffm.h out its not used except for a constant that is part of the format
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | ffserver.c | 1 | ||||
| -rw-r--r-- | ffserver_config.c | 3 | ||||
| -rw-r--r-- | ffserver_config.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/ffserver.c b/ffserver.c index cfb1a6cad0..c16f8aa756 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 0ec93b5fda..99709b54c7 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 1b121946c1..0bd4cfc762 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" |