Merge commit 'ec96a89c3e507cf0fb1f2b159b28a53f2bad9a74'

* commit 'ec96a89c3e507cf0fb1f2b159b28a53f2bad9a74':
  rtpdec: Don't pass non-const pointers to fmtp attribute parsing functions

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

diff --cc libavformat/rtpdec.c
Simple merge

diff --cc libavformat/rtpdec.h
Simple merge

diff --cc libavformat/rtpdec_amr.c
Simple merge

diff --cc libavformat/rtpdec_dv.c
Simple merge

diff --cc libavformat/rtpdec_h264.c
Simple merge

diff --cc libavformat/rtpdec_hevc.c
Simple merge

diff --cc libavformat/rtpdec_ilbc.c
Simple merge

diff --cc libavformat/rtpdec_latm.c
Simple merge

diff --cc libavformat/rtpdec_mpeg4.c
Simple merge

diff --cc libavformat/rtpdec_xiph.c
Simple merge