diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-13 12:18:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-13 12:18:12 +0100 |
| commit | 2e5e2bf935ae91b3113f480086c0652f17935b0c (patch) | |
| tree | 5e3612762764660b33ccf6084a87e874bfd1c91d /libavformat/rtpdec_mpeg4.c | |
| parent | de7c95d551881a01cd24885f23bd180fcecc5c07 (diff) | |
| parent | f3f60dcbdd6ff2201526a603fe28293975bb7667 (diff) | |
| download | ffmpeg-2e5e2bf935ae91b3113f480086c0652f17935b0c.tar.gz | |
Merge commit 'f3f60dcbdd6ff2201526a603fe28293975bb7667'
* commit 'f3f60dcbdd6ff2201526a603fe28293975bb7667':
rtpdec_mpeg4: Cosmetic cleanup
rtpdec: Cosmetic cleanup of the header
rtpdec: Get rid of a useless _s suffix on a struct name
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_mpeg4.c')
| -rw-r--r-- | libavformat/rtpdec_mpeg4.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/libavformat/rtpdec_mpeg4.c b/libavformat/rtpdec_mpeg4.c index a647169e0e..02dc242c67 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)) |