Commit 7d51eddd authored by Diego Pettenò's avatar Diego Pettenò Committed by Luca Abeni

Make AVRtpPayloadTypes static and constant

Patch by Diego 'Flameeyes' Pettenò (flameeyes AT gmail DOT com)

Originally committed as revision 11432 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 51b73087
...@@ -29,7 +29,15 @@ ...@@ -29,7 +29,15 @@
//#define DEBUG //#define DEBUG
/* from http://www.iana.org/assignments/rtp-parameters last updated 05 January 2005 */ /* 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}, {0, "PCMU", CODEC_TYPE_AUDIO, CODEC_ID_PCM_MULAW, 8000, 1},
{1, "Reserved", CODEC_TYPE_UNKNOWN, CODEC_ID_NONE, -1, -1}, {1, "Reserved", CODEC_TYPE_UNKNOWN, CODEC_ID_NONE, -1, -1},
......
...@@ -85,16 +85,6 @@ typedef struct rtp_payload_data_s ...@@ -85,16 +85,6 @@ typedef struct rtp_payload_data_s
int cur_au_index; int cur_au_index;
} rtp_payload_data_t; } 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 #if 0
typedef enum { typedef enum {
RTCP_SR = 200, RTCP_SR = 200,
...@@ -120,5 +110,4 @@ typedef enum { ...@@ -120,5 +110,4 @@ typedef enum {
} rtcp_sdes_type_t; } rtcp_sdes_type_t;
#endif #endif
extern AVRtpPayloadType_t AVRtpPayloadTypes[];
#endif /* FFMPEG_RTP_H */ #endif /* FFMPEG_RTP_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment