[FFmpeg-cvslog] r11432 - in trunk/libavformat: rtp.c rtp.h

[lucabe]

Author: lucabe
Date: Sun Jan  6 11:00:04 2008
New Revision: 11432

Log:
Make AVRtpPayloadTypes static and constant
Patch by Diego 'Flameeyes' Petten? (flameeyes AT gmail DOT com)


Modified:
   trunk/libavformat/rtp.c
   trunk/libavformat/rtp.h

Modified: trunk/libavformat/rtp.c
==============================================================================
--- trunk/libavformat/rtp.c	(original)
+++ trunk/libavformat/rtp.c	Sun Jan  6 11:00:04 2008
@@ -29,7 +29,15 @@
 //#define DEBUG
 
 /* from http://www.iana.org/assignments/rtp-parameters last updated 05 January 2005 */
-AVRtpPayloadType_t AVRtpPayloadTypes[]=
+static const struct
+{
+    int pt;
+    const char enc_name[50]; /* XXX: why 50 ? */
+    enum CodecType codec_type;
+    enum CodecID codec_id;
+    int clock_rate;
+    int audio_channels;
+} AVRtpPayloadTypes[]=
 {
   {0, "PCMU",        CODEC_TYPE_AUDIO,   CODEC_ID_PCM_MULAW, 8000, 1},
   {1, "Reserved",    CODEC_TYPE_UNKNOWN, CODEC_ID_NONE, -1, -1},

Modified: trunk/libavformat/rtp.h
==============================================================================
--- trunk/libavformat/rtp.h	(original)
+++ trunk/libavformat/rtp.h	Sun Jan  6 11:00:04 2008
@@ -85,16 +85,6 @@ typedef struct rtp_payload_data_s
     int cur_au_index;
 } rtp_payload_data_t;
 
-typedef struct AVRtpPayloadType_s
-{
-    int pt;
-    const char enc_name[50]; /* XXX: why 50 ? */
-    enum CodecType codec_type;
-    enum CodecID codec_id;
-    int clock_rate;
-    int audio_channels;
-} AVRtpPayloadType_t;
-
 #if 0
 typedef enum {
   RTCP_SR   = 200,
@@ -120,5 +110,4 @@ typedef enum {
 } rtcp_sdes_type_t;
 #endif
 
-extern AVRtpPayloadType_t AVRtpPayloadTypes[];
 #endif /* FFMPEG_RTP_H */