Merge commit 'ec96a89c3e507cf0fb1f2b159b28a53f2bad9a74'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 22:44:20 +0000 (23:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 22:44:25 +0000 (23:44 +0100)
* commit 'ec96a89c3e507cf0fb1f2b159b28a53f2bad9a74':
  rtpdec: Don't pass non-const pointers to fmtp attribute parsing functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtpdec.c
libavformat/rtpdec.h
libavformat/rtpdec_amr.c
libavformat/rtpdec_dv.c
libavformat/rtpdec_h264.c
libavformat/rtpdec_hevc.c
libavformat/rtpdec_ilbc.c
libavformat/rtpdec_latm.c
libavformat/rtpdec_mpeg4.c
libavformat/rtpdec_xiph.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge