[FFmpeg-cvslog] r10871 - in trunk: ffplay.c ffserver.c libavformat/avformat.h libavformat/rtsp.c

[lucabe]

Author: lucabe
Date: Mon Oct 29 10:15:35 2007
New Revision: 10871

Log:
Remove the inclusion of rtsp.h and rtp.h from avformat.h, and
explicitly include such headers where needed


Modified:
   trunk/ffplay.c
   trunk/ffserver.c
   trunk/libavformat/avformat.h
   trunk/libavformat/rtsp.c

Modified: trunk/ffplay.c
==============================================================================
--- trunk/ffplay.c	(original)
+++ trunk/ffplay.c	Mon Oct 29 10:15:35 2007
@@ -22,6 +22,7 @@
 #include <math.h>
 #include <limits.h>
 #include "avformat.h"
+#include "rtsp.h"
 #include "swscale.h"
 #include "avstring.h"
 

Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c	(original)
+++ trunk/ffserver.c	Mon Oct 29 10:15:35 2007
@@ -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>

Modified: trunk/libavformat/avformat.h
==============================================================================
--- trunk/libavformat/avformat.h	(original)
+++ trunk/libavformat/avformat.h	Mon Oct 29 10:15:35 2007
@@ -460,10 +460,6 @@ enum CodecID av_guess_image2_codec(const
 /* 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);

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	(original)
+++ trunk/libavformat/rtsp.c	Mon Oct 29 10:15:35 2007
@@ -24,6 +24,7 @@
 #include <unistd.h> /* for select() prototype */
 #include "network.h"
 #include "avstring.h"
+#include "rtsp.h"
 
 #include "rtp_internal.h"