Merge commit 'db158f0dd217cf839be8af195d66cf49a76537a8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 21:26:15 +0000 (22:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 21:26:15 +0000 (22:26 +0100)
commita51b192f3b8f89a1bafba629655df55348b14195
tree51a19ca6a9121e3bb96ce2d8deb6340e34d1bafa
parent8c6651a14db2f8d8ff53b6fb17f55a4d8ae8c379
parentdb158f0dd217cf839be8af195d66cf49a76537a8
Merge commit 'db158f0dd217cf839be8af195d66cf49a76537a8'

* commit 'db158f0dd217cf839be8af195d66cf49a76537a8':
  rtpdec: Remove unnecessary _if_needed suffixes on functions

Conflicts:
libavformat/rtpdec_xiph.c

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