Originally committed as revision 22109 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.6
| @@ -216,10 +216,10 @@ OBJS-$(CONFIG_SDP_DEMUXER) += rtsp.o \ | |||||
| rtp.o \ | rtp.o \ | ||||
| rtpdec.o \ | rtpdec.o \ | ||||
| rtpdec_amr.o \ | rtpdec_amr.o \ | ||||
| rtpdec_asf.o \ | |||||
| rtpdec_h263.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_SEGAFILM_DEMUXER) += segafilm.o | ||||
| OBJS-$(CONFIG_SHORTEN_DEMUXER) += raw.o id3v2.o | OBJS-$(CONFIG_SHORTEN_DEMUXER) += raw.o id3v2.o | ||||
| OBJS-$(CONFIG_SIFF_DEMUXER) += siff.o | OBJS-$(CONFIG_SIFF_DEMUXER) += siff.o | ||||
| @@ -30,11 +30,11 @@ | |||||
| #include "network.h" | #include "network.h" | ||||
| #include "rtpdec.h" | #include "rtpdec.h" | ||||
| #include "rtp_asf.h" | |||||
| #include "rtp_h264.h" | |||||
| #include "rtp_vorbis.h" | |||||
| #include "rtpdec_amr.h" | #include "rtpdec_amr.h" | ||||
| #include "rtpdec_asf.h" | |||||
| #include "rtpdec_h263.h" | #include "rtpdec_h263.h" | ||||
| #include "rtpdec_h264.h" | |||||
| #include "rtpdec_vorbis.h" | |||||
| //#define DEBUG | //#define DEBUG | ||||
| @@ -20,7 +20,7 @@ | |||||
| */ | */ | ||||
| /** | /** | ||||
| * @file libavformat/rtp_asf.c | |||||
| * @file libavformat/rtpdec_asf.c | |||||
| * @brief Microsoft RTP/ASF support | * @brief Microsoft RTP/ASF support | ||||
| * @author Ronald S. Bultje <rbultje@ronald.bitfreak.net> | * @author Ronald S. Bultje <rbultje@ronald.bitfreak.net> | ||||
| */ | */ | ||||
| @@ -29,7 +29,7 @@ | |||||
| #include <libavutil/avstring.h> | #include <libavutil/avstring.h> | ||||
| #include <libavutil/intreadwrite.h> | #include <libavutil/intreadwrite.h> | ||||
| #include "rtp.h" | #include "rtp.h" | ||||
| #include "rtp_asf.h" | |||||
| #include "rtpdec_asf.h" | |||||
| #include "rtsp.h" | #include "rtsp.h" | ||||
| #include "asf.h" | #include "asf.h" | ||||
| @@ -19,8 +19,8 @@ | |||||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | * 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 "avformat.h" | ||||
| #include "rtpdec.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, | extern RTPDynamicProtocolHandler ff_ms_rtp_asf_pfv_handler, | ||||
| ff_ms_rtp_asf_pfa_handler; | ff_ms_rtp_asf_pfa_handler; | ||||
| #endif /* AVFORMAT_RTP_ASF_H */ | |||||
| #endif /* AVFORMAT_RTPDEC_ASF_H */ | |||||
| @@ -20,7 +20,7 @@ | |||||
| */ | */ | ||||
| /** | /** | ||||
| * @file libavformat/rtp_h264.c | |||||
| * @file libavformat/rtpdec_h264.c | |||||
| * @brief H.264 / RTP Code (RFC3984) | * @brief H.264 / RTP Code (RFC3984) | ||||
| * @author Ryan Martell <rdm4@martellventures.com> | * @author Ryan Martell <rdm4@martellventures.com> | ||||
| * | * | ||||
| @@ -47,7 +47,7 @@ | |||||
| #include <assert.h> | #include <assert.h> | ||||
| #include "rtpdec.h" | #include "rtpdec.h" | ||||
| #include "rtp_h264.h" | |||||
| #include "rtpdec_h264.h" | |||||
| /** | /** | ||||
| RTP/H264 specific private data. | RTP/H264 specific private data. | ||||
| @@ -19,11 +19,11 @@ | |||||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | * 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" | #include "rtpdec.h" | ||||
| extern RTPDynamicProtocolHandler ff_h264_dynamic_handler; | extern RTPDynamicProtocolHandler ff_h264_dynamic_handler; | ||||
| #endif /* AVFORMAT_RTP_H264_H */ | |||||
| #endif /* AVFORMAT_RTPDEC_H264_H */ | |||||
| @@ -20,7 +20,7 @@ | |||||
| */ | */ | ||||
| /** | /** | ||||
| * @file libavformat/rtp_vorbis.c | |||||
| * @file libavformat/rtpdec_vorbis.c | |||||
| * @brief Vorbis / RTP Code (RFC 5215) | * @brief Vorbis / RTP Code (RFC 5215) | ||||
| * @author Colin McQuillan <m.niloc@gmail.com> | * @author Colin McQuillan <m.niloc@gmail.com> | ||||
| */ | */ | ||||
| @@ -32,7 +32,7 @@ | |||||
| #include <assert.h> | #include <assert.h> | ||||
| #include "rtpdec.h" | #include "rtpdec.h" | ||||
| #include "rtp_vorbis.h" | |||||
| #include "rtpdec_vorbis.h" | |||||
| /** | /** | ||||
| * RTP/Vorbis specific private data. | * RTP/Vorbis specific private data. | ||||
| @@ -19,8 +19,8 @@ | |||||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | * 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 "libavcodec/avcodec.h" | ||||
| #include "rtpdec.h" | #include "rtpdec.h" | ||||
| @@ -42,4 +42,4 @@ ff_vorbis_parse_fmtp_config(AVCodecContext * codec, | |||||
| */ | */ | ||||
| extern RTPDynamicProtocolHandler ff_vorbis_dynamic_handler; | extern RTPDynamicProtocolHandler ff_vorbis_dynamic_handler; | ||||
| #endif /* AVFORMAT_RTP_VORBIS_H */ | |||||
| #endif /* AVFORMAT_RTPDEC_VORBIS_H */ | |||||
| @@ -37,8 +37,8 @@ | |||||
| #include "rtpdec.h" | #include "rtpdec.h" | ||||
| #include "rdt.h" | #include "rdt.h" | ||||
| #include "rtp_asf.h" | |||||
| #include "rtp_vorbis.h" | |||||
| #include "rtpdec_asf.h" | |||||
| #include "rtpdec_vorbis.h" | |||||
| //#define DEBUG | //#define DEBUG | ||||
| //#define DEBUG_RTP_TCP | //#define DEBUG_RTP_TCP | ||||