Merge commit '199fb40278146c5bb162990c66ad3cd561abc780'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 23:40:58 +0000 (00:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 23:42:14 +0000 (00:42 +0100)
commit7d9b06eb179fb0d032c530d21182dce3fe0a7671
tree7be8a4aaa2ed84b83b868f4f636c3a27dfe7b98c
parent6e9bbaca6c6739e6524809d3e786ce1e10ad518b
parent199fb40278146c5bb162990c66ad3cd561abc780
Merge commit '199fb40278146c5bb162990c66ad3cd561abc780'

* commit '199fb40278146c5bb162990c66ad3cd561abc780':
  rtpdec: Use ffio_free_dyn_buf

Conflicts:
libavformat/rtpdec_latm.c
libavformat/rtpdec_svq3.c
libavformat/rtpdec_xiph.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtpdec_ac3.c
libavformat/rtpdec_asf.c
libavformat/rtpdec_dv.c
libavformat/rtpdec_h261.c
libavformat/rtpdec_h263_rfc2190.c
libavformat/rtpdec_jpeg.c
libavformat/rtpdec_latm.c
libavformat/rtpdec_mpa_robust.c
libavformat/rtpdec_svq3.c
libavformat/rtpdec_vp8.c
libavformat/rtpdec_xiph.c