diff options
| author | Luca Abeni <lucabe72@email.it> | 2007-10-29 09:15:35 +0000 |
|---|---|---|
| committer | Luca Abeni <lucabe72@email.it> | 2007-10-29 09:15:35 +0000 |
| commit | c971ff1977c6fc1e1974525edc7e2d96d96da188 (patch) | |
| tree | d95a7376a1dee1474dfee1e10c6ca10cb7f03fa5 | |
| parent | c1a4cdf9bfa2ecb1a88979226298fba47a80c369 (diff) | |
| download | ffmpeg-c971ff1977c6fc1e1974525edc7e2d96d96da188.tar.gz | |
Remove the inclusion of rtsp.h and rtp.h from avformat.h, and
explicitly include such headers where needed
Originally committed as revision 10871 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | ffplay.c | 1 | ||||
| -rw-r--r-- | ffserver.c | 2 | ||||
| -rw-r--r-- | libavformat/avformat.h | 4 | ||||
| -rw-r--r-- | libavformat/rtsp.c | 1 |
4 files changed, 4 insertions, 4 deletions
@@ -22,6 +22,7 @@ #include <math.h> #include <limits.h> #include "avformat.h" +#include "rtsp.h" #include "swscale.h" #include "avstring.h" diff --git a/ffserver.c b/ffserver.c index 94c565a026..96b298795d 100644 --- a/ffserver.c +++ b/ffserver.c @@ -26,6 +26,8 @@ #include <string.h> #include <stdlib.h> #include "avformat.h" +#include "rtsp.h" +#include "rtp.h" #include <stdarg.h> #include <unistd.h> diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 4070e02ea3..4c72a617c3 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -460,10 +460,6 @@ enum CodecID av_guess_image2_codec(const char *filename); /* XXX: use automatic init with either ELF sections or C file parser */ /* modules */ -#include "rtp.h" - -#include "rtsp.h" - /* utils.c */ void av_register_input_format(AVInputFormat *format); void av_register_output_format(AVOutputFormat *format); diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index db11049002..9ef7f1f80e 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -24,6 +24,7 @@ #include <unistd.h> /* for select() prototype */ #include "network.h" #include "avstring.h" +#include "rtsp.h" #include "rtp_internal.h" |