Rename RTP depacketizer files from rtp_* to rtpdec_*

Originally committed as revision 22109 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 48b8f80..eb710cc 100644 (file)
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -216,10 +216,10 @@ OBJS-$(CONFIG_SDP_DEMUXER)               += rtsp.o        \
                                             rtp.o         \
                                             rtpdec.o      \
                                             rtpdec_amr.o  \
+                                            rtpdec_asf.o  \
                                             rtpdec_h263.o \
-                                            rtp_asf.o     \
-                                            rtp_h264.o    \
-                                            rtp_vorbis.o
+                                            rtpdec_h264.o \
+                                            rtpdec_vorbis.o
 OBJS-$(CONFIG_SEGAFILM_DEMUXER)          += segafilm.o
 OBJS-$(CONFIG_SHORTEN_DEMUXER)           += raw.o id3v2.o
 OBJS-$(CONFIG_SIFF_DEMUXER)              += siff.o

diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index af74409..d60a573 100644 (file)
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -30,11 +30,11 @@
 #include "network.h"
 
 #include "rtpdec.h"
-#include "rtp_asf.h"
-#include "rtp_h264.h"
-#include "rtp_vorbis.h"
 #include "rtpdec_amr.h"
+#include "rtpdec_asf.h"
 #include "rtpdec_h263.h"
+#include "rtpdec_h264.h"
+#include "rtpdec_vorbis.h"
 
 //#define DEBUG
 

diff --git a/libavformat/rtp_asf.c b/libavformat/rtpdec_asf.c
similarity index 99%
rename from libavformat/rtp_asf.c
rename to libavformat/rtpdec_asf.c
index 75662c9..44c1c83 100644 (file)
--- a/libavformat/rtp_asf.c
+++ b/libavformat/rtpdec_asf.c
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file libavformat/rtp_asf.c
+ * @file libavformat/rtpdec_asf.c
  * @brief Microsoft RTP/ASF support
  * @author Ronald S. Bultje <rbultje@ronald.bitfreak.net>
  */
@@ -29,7 +29,7 @@
 #include <libavutil/avstring.h>
 #include <libavutil/intreadwrite.h>
 #include "rtp.h"
-#include "rtp_asf.h"
+#include "rtpdec_asf.h"
 #include "rtsp.h"
 #include "asf.h"
 

diff --git a/libavformat/rtp_asf.h b/libavformat/rtpdec_asf.h
similarity index 93%
rename from libavformat/rtp_asf.h
rename to libavformat/rtpdec_asf.h
index 2898894..5d60a14 100644 (file)
--- a/libavformat/rtp_asf.h
+++ b/libavformat/rtpdec_asf.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVFORMAT_RTP_ASF_H
-#define AVFORMAT_RTP_ASF_H
+#ifndef AVFORMAT_RTPDEC_ASF_H
+#define AVFORMAT_RTPDEC_ASF_H
 
 #include "avformat.h"
 #include "rtpdec.h"
@@ -40,4 +40,4 @@ void ff_wms_parse_sdp_a_line(AVFormatContext *s, const char *p);
 extern RTPDynamicProtocolHandler ff_ms_rtp_asf_pfv_handler,
                                  ff_ms_rtp_asf_pfa_handler;
 
-#endif /* AVFORMAT_RTP_ASF_H */
+#endif /* AVFORMAT_RTPDEC_ASF_H */

diff --git a/libavformat/rtp_h264.c b/libavformat/rtpdec_h264.c
similarity index 99%
rename from libavformat/rtp_h264.c
rename to libavformat/rtpdec_h264.c
index 5e19882..f41dfdc 100644 (file)
--- a/libavformat/rtp_h264.c
+++ b/libavformat/rtpdec_h264.c
@@ -20,7 +20,7 @@
  */
 
 /**
-* @file libavformat/rtp_h264.c
+* @file libavformat/rtpdec_h264.c
  * @brief H.264 / RTP Code (RFC3984)
  * @author Ryan Martell <rdm4@martellventures.com>
  *
@@ -47,7 +47,7 @@
 #include <assert.h>
 
 #include "rtpdec.h"
-#include "rtp_h264.h"
+#include "rtpdec_h264.h"
 
 /**
     RTP/H264 specific private data.

diff --git a/libavformat/rtp_h264.h b/libavformat/rtpdec_h264.h
similarity index 90%
rename from libavformat/rtp_h264.h
rename to libavformat/rtpdec_h264.h
index c1e92bd..b4d54de 100644 (file)
--- a/libavformat/rtp_h264.h
+++ b/libavformat/rtpdec_h264.h
@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVFORMAT_RTP_H264_H
-#define AVFORMAT_RTP_H264_H
+#ifndef AVFORMAT_RTPDEC_H264_H
+#define AVFORMAT_RTPDEC_H264_H
 
 #include "rtpdec.h"
 
 extern RTPDynamicProtocolHandler ff_h264_dynamic_handler;
 
-#endif /* AVFORMAT_RTP_H264_H */
+#endif /* AVFORMAT_RTPDEC_H264_H */

diff --git a/libavformat/rtp_vorbis.c b/libavformat/rtpdec_vorbis.c
similarity index 99%
rename from libavformat/rtp_vorbis.c
rename to libavformat/rtpdec_vorbis.c
index 4f62863..3d1b2cc 100644 (file)
--- a/libavformat/rtp_vorbis.c
+++ b/libavformat/rtpdec_vorbis.c
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file libavformat/rtp_vorbis.c
+ * @file libavformat/rtpdec_vorbis.c
  * @brief Vorbis / RTP Code (RFC 5215)
  * @author Colin McQuillan <m.niloc@gmail.com>
  */
@@ -32,7 +32,7 @@
 #include <assert.h>
 
 #include "rtpdec.h"
-#include "rtp_vorbis.h"
+#include "rtpdec_vorbis.h"
 
 /**
  * RTP/Vorbis specific private data.

diff --git a/libavformat/rtp_vorbis.h b/libavformat/rtpdec_vorbis.h
similarity index 92%
rename from libavformat/rtp_vorbis.h
rename to libavformat/rtpdec_vorbis.h
index bd93ef7..ee5548b 100644 (file)
--- a/libavformat/rtp_vorbis.h
+++ b/libavformat/rtpdec_vorbis.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVFORMAT_RTP_VORBIS_H
-#define AVFORMAT_RTP_VORBIS_H
+#ifndef AVFORMAT_RTPDEC_VORBIS_H
+#define AVFORMAT_RTPDEC_VORBIS_H
 
 #include "libavcodec/avcodec.h"
 #include "rtpdec.h"
@@ -42,4 +42,4 @@ ff_vorbis_parse_fmtp_config(AVCodecContext * codec,
  */
 extern RTPDynamicProtocolHandler ff_vorbis_dynamic_handler;
 
-#endif /* AVFORMAT_RTP_VORBIS_H */
+#endif /* AVFORMAT_RTPDEC_VORBIS_H */

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 6a3f38b..bc0b3b3 100644 (file)
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -37,8 +37,8 @@
 
 #include "rtpdec.h"
 #include "rdt.h"
-#include "rtp_asf.h"
-#include "rtp_vorbis.h"
+#include "rtpdec_asf.h"
+#include "rtpdec_vorbis.h"
 
 //#define DEBUG
 //#define DEBUG_RTP_TCP