diff options
| author | Martin Storsjö <martin@martin.st> | 2013-01-11 14:44:40 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-01-12 00:01:28 +0200 |
| commit | 58b59718813bec23add7662ff8a16b75027a5c9e (patch) | |
| tree | 129a7455f9f29cf23afdac3762a1bffec87107f5 /libavformat/rtp.c | |
| parent | d11cb13b0ef02fb1c303b29805819f6e1c9dc61b (diff) | |
| download | ffmpeg-58b59718813bec23add7662ff8a16b75027a5c9e.tar.gz | |
rtp: Cosmetic cleanup
Remove leftover debug comments, fix brace placement and
add whitespace, remove unnecessary and weirdly placed braces.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/rtp.c')
| -rw-r--r-- | libavformat/rtp.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libavformat/rtp.c b/libavformat/rtp.c index 38b2348d45..90839ed659 100644 --- a/libavformat/rtp.c +++ b/libavformat/rtp.c @@ -24,24 +24,20 @@ #include "rtp.h" -//#define DEBUG - /* from http://www.iana.org/assignments/rtp-parameters last updated 05 January 2005 */ /* payload types >= 96 are dynamic; * payload types between 72 and 76 are reserved for RTCP conflict avoidance; * all the other payload types not present in the table are unassigned or * reserved */ -static const struct -{ +static const struct { int pt; const char enc_name[6]; enum AVMediaType codec_type; enum AVCodecID codec_id; int clock_rate; int audio_channels; -} AVRtpPayloadTypes[]= -{ +} AVRtpPayloadTypes[] = { {0, "PCMU", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_PCM_MULAW, 8000, 1}, {3, "GSM", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_NONE, 8000, 1}, {4, "G723", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_G723_1, 8000, 1}, @@ -137,9 +133,8 @@ const char *ff_rtp_enc_name(int payload_type) int i; for (i = 0; AVRtpPayloadTypes[i].pt >= 0; i++) - if (AVRtpPayloadTypes[i].pt == payload_type) { + if (AVRtpPayloadTypes[i].pt == payload_type) return AVRtpPayloadTypes[i].enc_name; - } return ""; } @@ -149,9 +144,8 @@ enum AVCodecID ff_rtp_codec_id(const char *buf, enum AVMediaType codec_type) int i; for (i = 0; AVRtpPayloadTypes[i].pt >= 0; i++) - if (!strcmp(buf, AVRtpPayloadTypes[i].enc_name) && (codec_type == AVRtpPayloadTypes[i].codec_type)){ + if (!strcmp(buf, AVRtpPayloadTypes[i].enc_name) && (codec_type == AVRtpPayloadTypes[i].codec_type)) return AVRtpPayloadTypes[i].codec_id; - } return AV_CODEC_ID_NONE; } |