diff options
| author | Diego Pettenò <flameeyes@gmail.com> | 2008-01-06 10:00:04 +0000 |
|---|---|---|
| committer | Luca Abeni <lucabe72@email.it> | 2008-01-06 10:00:04 +0000 |
| commit | 7d51edddd4d5bc9ef2275ebb48571a85fa4d949d (patch) | |
| tree | 535880cb9cfd8fc0da1e1151086bee73dacb2b21 | |
| parent | 51b73087b93b6f3b7af0a0a0a1e8e3de9dac2860 (diff) | |
| download | ffmpeg-7d51edddd4d5bc9ef2275ebb48571a85fa4d949d.tar.gz | |
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
| -rw-r--r-- | libavformat/rtp.c | 10 | ||||
| -rw-r--r-- | libavformat/rtp.h | 11 |
2 files changed, 9 insertions, 12 deletions
diff --git a/libavformat/rtp.c b/libavformat/rtp.c index ddd2ad1601..6b038c8255 100644 --- a/libavformat/rtp.c +++ b/libavformat/rtp.c @@ -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}, diff --git a/libavformat/rtp.h b/libavformat/rtp.h index 4f6251bf34..21cfdb4cf1 100644 --- a/libavformat/rtp.h +++ b/libavformat/rtp.h @@ -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 */ |