Merge commit 'ac0e54fda9305cc7d149007f5b512bb8619f7c78'

* commit 'ac0e54fda9305cc7d149007f5b512bb8619f7c78':
  rtpdec: Add const to string parameters in internal fmtp parsing functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavformat/rtpdec_h264.c
Simple merge

diff --cc libavformat/rtpdec_latm.c
Simple merge

diff --cc libavformat/rtpdec_mpeg4.c
index 27184d9,fe6b440..531d076
--- 1/libavformat/rtpdec_mpeg4.c
--- 2/libavformat/rtpdec_mpeg4.c
+++ b/libavformat/rtpdec_mpeg4.c
@@@ -93,12 -93,12 +93,12 @@@ static const AttrNameMap attr_names[] 
  
  static void free_context(PayloadContext *data)
  {
 -    av_free(data->au_headers);
 -    av_free(data->mode);
 -    av_free(data);
 +    av_freep(&data->au_headers);
 +    av_freep(&data->mode);
 +    av_freep(&data);
  }
  
- static int parse_fmtp_config(AVCodecContext *codec, char *value)
+ static int parse_fmtp_config(AVCodecContext *codec, const char *value)
  {
      /* decode the hexa encoded parameter */
      int len = ff_hex_to_data(NULL, value);