ffmpeg source update for sep 09

source/patched-ffmpeg-mt/libavformat/rtpdec_mpeg4.c

 /**
  * Common code for the RTP depacketization of MPEG-4 formats.
  * Copyright (c) 2010 Fabrice Bellard
  *                    Romain Degez
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ skipping 43 matching lines @@
         int dts;
         int rap_flag;
         int streamstate;
     } *au_headers;
     int au_headers_allocated;
     int nb_au_headers;
     int au_headers_length_bytes;
     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;
     uint32_t    offset;
 } AttrNameMap;
 
 /* 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[]=
@@ skipping 29 matching lines @@
           */
        av_free(&data->au_headers[i]);
     }
     av_free(data->mode);
     av_free(data);
 }
 
 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;
 }
 
 static int rtp_parse_mp4_au(PayloadContext *data, const uint8_t *buf)
 {
     int au_headers_length, au_header_size, i;
     GetBitContext getbitcontext;
 
     /* decode the first 2 bytes where the AUHeader sections are stored
        length in bits */
@@ skipping 112 matching lines @@
 
 RTPDynamicProtocolHandler ff_mpeg4_generic_dynamic_handler = {
     .enc_name           = "mpeg4-generic",
     .codec_type         = AVMEDIA_TYPE_AUDIO,
     .codec_id           = CODEC_ID_AAC,
     .parse_sdp_a_line   = parse_sdp_line,
     .open               = new_context,
     .close              = free_context,
     .parse_packet       = aac_parse_packet
 };