har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtpdec_mpeg4: Cosmetic cleanup

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2012-12-11 21:42:32 +02:00
parent 584a017925
commit f3f60dcbdd
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavformat/rtpdec_mpeg4.c
View File

@ -32,9 +32,8 @@
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavcodec/get_bits.h" #include "libavcodec/get_bits.h"
/** Structure listing useful vars to parse RTP packet payload*/ /** Structure listing useful vars to parse RTP packet payload */
struct PayloadContext struct PayloadContext {
{
int sizelength; int sizelength;
int indexlength; int indexlength;
int indexdeltalength; int indexdeltalength;
@ -69,8 +68,7 @@ typedef struct {
/* All known fmtp parameters and the corresponding RTPAttrTypeEnum */ /* All known fmtp parameters and the corresponding RTPAttrTypeEnum */
#define ATTR_NAME_TYPE_INT 0 #define ATTR_NAME_TYPE_INT 0
#define ATTR_NAME_TYPE_STR 1 #define ATTR_NAME_TYPE_STR 1
static const AttrNameMap attr_names[]= static const AttrNameMap attr_names[] = {
{
{ "SizeLength", ATTR_NAME_TYPE_INT, { "SizeLength", ATTR_NAME_TYPE_INT,
offsetof(PayloadContext, sizelength) }, offsetof(PayloadContext, sizelength) },
{ "IndexLength", ATTR_NAME_TYPE_INT, { "IndexLength", ATTR_NAME_TYPE_INT,
@ -91,14 +89,14 @@ static PayloadContext *new_context(void)
return av_mallocz(sizeof(PayloadContext)); 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->au_headers);
av_free(data->mode); av_free(data->mode);
av_free(data); 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 */ /* decode the hexa encoded parameter */
int len = ff_hex_to_data(NULL, value); 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 */ /* Follows RFC 3640 */
static int aac_parse_packet(AVFormatContext *ctx, static int aac_parse_packet(AVFormatContext *ctx, PayloadContext *data,
PayloadContext *data, AVStream *st, AVPacket *pkt, uint32_t *timestamp,
AVStream *st,
AVPacket *pkt,
uint32_t *timestamp,
const uint8_t *buf, int len, int flags) const uint8_t *buf, int len, int flags)
{ {
if (rtp_parse_mp4_au(data, buf)) if (rtp_parse_mp4_au(data, buf))