[SCM] libav/experimental: Move to rtp.h the prototypes of all the functions defined in rtp.c

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:38:36 UTC 2013


The following commit has been merged in the experimental branch:
commit e5f483c60455a06f99b2fbc6df402bdf8fc98782
Author: Luca Abeni <lucabe72 at email.it>
Date:   Tue Feb 17 08:09:34 2009 +0000

    Move to rtp.h the prototypes of all the functions defined in rtp.c
    
    Originally committed as revision 17389 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/rtp.h b/libavformat/rtp.h
index 3d8b79a..bcc5349 100644
--- a/libavformat/rtp.h
+++ b/libavformat/rtp.h
@@ -33,6 +33,10 @@
  */
 int ff_rtp_get_payload_type(AVCodecContext *codec);
 
+int rtp_get_codec_info(AVCodecContext *codec, int payload_type);
+const char *ff_rtp_enc_name(int payload_type);
+enum CodecID ff_rtp_codec_id(const char *buf, enum CodecType codec_type);
+
 #define RTP_PT_PRIVATE 96
 #define RTP_VERSION 2
 #define RTP_MAX_SDES 256   /**< maximum text length for SDES */
diff --git a/libavformat/rtpdec.h b/libavformat/rtpdec.h
index 72431f9..ef0ce85 100644
--- a/libavformat/rtpdec.h
+++ b/libavformat/rtpdec.h
@@ -59,8 +59,6 @@ typedef struct RTPDynamicProtocolHandler_s RTPDynamicProtocolHandler;
 #define RTP_MIN_PACKET_LENGTH 12
 #define RTP_MAX_PACKET_LENGTH 1500 /* XXX: suppress this define */
 
-int rtp_get_codec_info(AVCodecContext *codec, int payload_type);
-
 typedef struct RTPDemuxContext RTPDemuxContext;
 RTPDemuxContext *rtp_parse_open(AVFormatContext *s1, AVStream *st, URLContext *rtpc, int payload_type, RTPPayloadData *rtp_payload_data);
 void rtp_parse_set_dynamic_protocol(RTPDemuxContext *s, PayloadContext *ctx,
@@ -180,9 +178,6 @@ void ff_register_dynamic_payload_handler(RTPDynamicProtocolHandler *handler);
 
 int rtsp_next_attr_and_value(const char **p, char *attr, int attr_size, char *value, int value_size); ///< from rtsp.c, but used by rtp dynamic protocol handlers.
 
-const char *ff_rtp_enc_name(int payload_type);
-enum CodecID ff_rtp_codec_id(const char *buf, enum CodecType codec_type);
-
 void av_register_rtp_dynamic_payload_handlers(void);
 
 #endif /* AVFORMAT_RTPDEC_H */

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list