Mercurial > libavformat.hg
diff rtpdec_mpeg4.c @ 6353:3f938b3a355a libavformat
Make hex_to_data a lavf internal function
This is useful for other future RTP depacketizers
author | mstorsjo |
---|---|
date | Mon, 09 Aug 2010 10:05:33 +0000 |
parents | 491eea5c52d6 |
children |
line wrap: on
line diff
--- a/rtpdec_mpeg4.c Mon Aug 09 08:14:48 2010 +0000 +++ b/rtpdec_mpeg4.c Mon Aug 09 10:05:33 2010 +0000 @@ -61,35 +61,6 @@ int cur_au_index; }; -/* return the length and optionally the data */ -static int hex_to_data(uint8_t *data, const char *p) -{ - int c, len, v; - - len = 0; - v = 1; - for (;;) { - p += strspn(p, SPACE_CHARS); - if (*p == '\0') - break; - c = toupper((unsigned char) *p++); - if (c >= '0' && c <= '9') - c = c - '0'; - else if (c >= 'A' && c <= 'F') - c = c - 'A' + 10; - else - break; - v = (v << 4) | c; - if (v & 0x100) { - if (data) - data[len] = v; - len++; - v = 1; - } - } - return len; -} - typedef struct { const char *str; uint16_t type; @@ -139,14 +110,14 @@ static int parse_fmtp_config(AVCodecContext * codec, char *value) { /* decode the hexa encoded parameter */ - int len = hex_to_data(NULL, value); + int len = ff_hex_to_data(NULL, value); if (codec->extradata) av_free(codec->extradata); codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE); if (!codec->extradata) return AVERROR(ENOMEM); codec->extradata_size = len; - hex_to_data(codec->extradata, value); + ff_hex_to_data(codec->extradata, value); return 0; }