Merge commit '88434f9725e7c9484dcbcf323566ae88a2904f32'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 22:44:41 +0000 (23:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 22:44:45 +0000 (23:44 +0100)
* commit '88434f9725e7c9484dcbcf323566ae88a2904f32':
  rtpdec: Remove unnecessary inline attributes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtpdec_jpeg.c
libavformat/rtpdec_mpa_robust.c
libavformat/rtpdec_xiph.c

Simple merge
Simple merge
Simple merge