[FFmpeg-cvslog] r22109 - in trunk/libavformat: Makefile rtp_asf.c rtp_asf.h rtp_h264.c rtp_h264.h rtp_vorbis.c rtp_vorbis.h rtpdec.c rtpdec_asf.c rtpdec_asf.h rtpdec_h264.c rtpdec_h264.h rtpdec_vorbis.c rtpdec_vor...
mstorsjo
subversion
Sun Feb 28 12:03:14 CET 2010
Author: mstorsjo
Date: Sun Feb 28 12:03:14 2010
New Revision: 22109
Log:
Rename RTP depacketizer files from rtp_* to rtpdec_*
Added:
trunk/libavformat/rtpdec_asf.c
- copied, changed from r22107, trunk/libavformat/rtp_asf.c
trunk/libavformat/rtpdec_asf.h
- copied, changed from r22107, trunk/libavformat/rtp_asf.h
trunk/libavformat/rtpdec_h264.c
- copied, changed from r22107, trunk/libavformat/rtp_h264.c
trunk/libavformat/rtpdec_h264.h
- copied, changed from r22107, trunk/libavformat/rtp_h264.h
trunk/libavformat/rtpdec_vorbis.c
- copied, changed from r22107, trunk/libavformat/rtp_vorbis.c
trunk/libavformat/rtpdec_vorbis.h
- copied, changed from r22107, trunk/libavformat/rtp_vorbis.h
Deleted:
trunk/libavformat/rtp_asf.c
trunk/libavformat/rtp_asf.h
trunk/libavformat/rtp_h264.c
trunk/libavformat/rtp_h264.h
trunk/libavformat/rtp_vorbis.c
trunk/libavformat/rtp_vorbis.h
Modified:
trunk/libavformat/Makefile
trunk/libavformat/rtpdec.c
trunk/libavformat/rtsp.c
Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile Sun Feb 28 11:58:27 2010 (r22108)
+++ trunk/libavformat/Makefile Sun Feb 28 12:03:14 2010 (r22109)
@@ -216,10 +216,10 @@ OBJS-$(CONFIG_SDP_DEMUXER)
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
Modified: trunk/libavformat/rtpdec.c
==============================================================================
--- trunk/libavformat/rtpdec.c Sun Feb 28 11:58:27 2010 (r22108)
+++ trunk/libavformat/rtpdec.c Sun Feb 28 12:03:14 2010 (r22109)
@@ -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
Copied and modified: trunk/libavformat/rtpdec_asf.c (from r22107, trunk/libavformat/rtp_asf.c)
==============================================================================
--- trunk/libavformat/rtp_asf.c Sun Feb 28 04:59:15 2010 (r22107, copy source)
+++ trunk/libavformat/rtpdec_asf.c Sun Feb 28 12:03:14 2010 (r22109)
@@ -20,7 +20,7 @@
*/
/**
- * @file libavformat/rtp_asf.c
+ * @file libavformat/rtpdec_asf.c
* @brief Microsoft RTP/ASF support
* @author Ronald S. Bultje <rbultje at 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"
Copied and modified: trunk/libavformat/rtpdec_asf.h (from r22107, trunk/libavformat/rtp_asf.h)
==============================================================================
--- trunk/libavformat/rtp_asf.h Sun Feb 28 04:59:15 2010 (r22107, copy source)
+++ trunk/libavformat/rtpdec_asf.h Sun Feb 28 12:03:14 2010 (r22109)
@@ -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(AVFormatCon
extern RTPDynamicProtocolHandler ff_ms_rtp_asf_pfv_handler,
ff_ms_rtp_asf_pfa_handler;
-#endif /* AVFORMAT_RTP_ASF_H */
+#endif /* AVFORMAT_RTPDEC_ASF_H */
Copied and modified: trunk/libavformat/rtpdec_h264.c (from r22107, trunk/libavformat/rtp_h264.c)
==============================================================================
--- trunk/libavformat/rtp_h264.c Sun Feb 28 04:59:15 2010 (r22107, copy source)
+++ trunk/libavformat/rtpdec_h264.c Sun Feb 28 12:03:14 2010 (r22109)
@@ -20,7 +20,7 @@
*/
/**
-* @file libavformat/rtp_h264.c
+* @file libavformat/rtpdec_h264.c
* @brief H.264 / RTP Code (RFC3984)
* @author Ryan Martell <rdm4 at 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.
Copied and modified: trunk/libavformat/rtpdec_h264.h (from r22107, trunk/libavformat/rtp_h264.h)
==============================================================================
--- trunk/libavformat/rtp_h264.h Sun Feb 28 04:59:15 2010 (r22107, copy source)
+++ trunk/libavformat/rtpdec_h264.h Sun Feb 28 12:03:14 2010 (r22109)
@@ -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 */
Copied and modified: trunk/libavformat/rtpdec_vorbis.c (from r22107, trunk/libavformat/rtp_vorbis.c)
==============================================================================
--- trunk/libavformat/rtp_vorbis.c Sun Feb 28 04:59:15 2010 (r22107, copy source)
+++ trunk/libavformat/rtpdec_vorbis.c Sun Feb 28 12:03:14 2010 (r22109)
@@ -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 at 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.
Copied and modified: trunk/libavformat/rtpdec_vorbis.h (from r22107, trunk/libavformat/rtp_vorbis.h)
==============================================================================
--- trunk/libavformat/rtp_vorbis.h Sun Feb 28 04:59:15 2010 (r22107, copy source)
+++ trunk/libavformat/rtpdec_vorbis.h Sun Feb 28 12:03:14 2010 (r22109)
@@ -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(AVCodecConte
*/
extern RTPDynamicProtocolHandler ff_vorbis_dynamic_handler;
-#endif /* AVFORMAT_RTP_VORBIS_H */
+#endif /* AVFORMAT_RTPDEC_VORBIS_H */
Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c Sun Feb 28 11:58:27 2010 (r22108)
+++ trunk/libavformat/rtsp.c Sun Feb 28 12:03:14 2010 (r22109)
@@ -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
More information about the ffmpeg-cvslog
mailing list