Merge commit 'bb4a310bb85f43e62240145a656b1e5285b14239'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 23:25:12 +0000 (00:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 23:25:12 +0000 (00:25 +0100)
commitfa80b76b110c663809671f7254bc07513710c061
tree8e5de25c31794db57407a8367a84f7207342631b
parent64f58d20b2008bd2c633beef3c21331dfff0d0e5
parentbb4a310bb85f43e62240145a656b1e5285b14239
Merge commit 'bb4a310bb85f43e62240145a656b1e5285b14239'

* commit 'bb4a310bb85f43e62240145a656b1e5285b14239':
  rtpdec: Don't free the payload context in the .free function

Conflicts:
libavformat/rtpdec_latm.c
libavformat/rtpdec_mpeg4.c
libavformat/rtpdec_mpegts.c
libavformat/rtpdec_xiph.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
17 files changed:
libavformat/rdt.c
libavformat/rtpdec.h
libavformat/rtpdec_ac3.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