Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 23:58:35 +0000 (00:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 23:58:39 +0000 (00:58 +0100)
commit3130e5be92858b9a15622965cacc9fe59f5336c2
tree28d727a541c482d942304d80162b537fcab2580a
parent7f03f75ce72fe1c6adfc63f621eeb69cde13769a
parentd594dbecce5f3af7f80bbf5bb1b516d740b69ccd
Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd'

* commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd':
  rtpdec: Rename the free method to close

Merged-by: Michael Niedermayer <michaelni@gmx.at>
18 files changed:
libavformat/rdt.c
libavformat/rtpdec.h
libavformat/rtpdec_ac3.c
libavformat/rtpdec_asf.c
libavformat/rtpdec_dv.c
libavformat/rtpdec_h261.c
libavformat/rtpdec_h263_rfc2190.c
libavformat/rtpdec_h264.c
libavformat/rtpdec_jpeg.c
libavformat/rtpdec_latm.c
libavformat/rtpdec_mpa_robust.c
libavformat/rtpdec_mpeg4.c
libavformat/rtpdec_mpegts.c
libavformat/rtpdec_qt.c
libavformat/rtpdec_svq3.c
libavformat/rtpdec_vp8.c
libavformat/rtpdec_xiph.c
libavformat/rtsp.c