From f3f60dcbdd6ff2201526a603fe28293975bb7667 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Tue, 11 Dec 2012 21:42:32 +0200 Subject: rtpdec_mpeg4: Cosmetic cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- libavformat/rtpdec_mpeg4.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'libavformat/rtpdec_mpeg4.c') diff --git a/libavformat/rtpdec_mpeg4.c b/libavformat/rtpdec_mpeg4.c index cc92c88636..dda48d8972 100644 --- a/libavformat/rtpdec_mpeg4.c +++ b/libavformat/rtpdec_mpeg4.c @@ -32,9 +32,8 @@ #include "libavutil/avstring.h" #include "libavcodec/get_bits.h" -/** Structure listing useful vars to parse RTP packet payload*/ -struct PayloadContext -{ +/** Structure listing useful vars to parse RTP packet payload */ +struct PayloadContext { int sizelength; int indexlength; int indexdeltalength; @@ -69,8 +68,7 @@ typedef struct { /* All known fmtp parameters and the corresponding RTPAttrTypeEnum */ #define ATTR_NAME_TYPE_INT 0 #define ATTR_NAME_TYPE_STR 1 -static const AttrNameMap attr_names[]= -{ +static const AttrNameMap attr_names[] = { { "SizeLength", ATTR_NAME_TYPE_INT, offsetof(PayloadContext, sizelength) }, { "IndexLength", ATTR_NAME_TYPE_INT, @@ -91,14 +89,14 @@ static PayloadContext *new_context(void) return av_mallocz(sizeof(PayloadContext)); } -static void free_context(PayloadContext * data) +static void free_context(PayloadContext *data) { av_free(data->au_headers); av_free(data->mode); av_free(data); } -static int parse_fmtp_config(AVCodecContext * codec, char *value) +static int parse_fmtp_config(AVCodecContext *codec, char *value) { /* decode the hexa encoded parameter */ int len = ff_hex_to_data(NULL, value); @@ -159,11 +157,8 @@ static int rtp_parse_mp4_au(PayloadContext *data, const uint8_t *buf) /* Follows RFC 3640 */ -static int aac_parse_packet(AVFormatContext *ctx, - PayloadContext *data, - AVStream *st, - AVPacket *pkt, - uint32_t *timestamp, +static int aac_parse_packet(AVFormatContext *ctx, PayloadContext *data, + AVStream *st, AVPacket *pkt, uint32_t *timestamp, const uint8_t *buf, int len, int flags) { if (rtp_parse_mp4_au(data, buf)) -- cgit v1.2.3