[FFmpeg-cvslog] Merge commit 'bb4a310bb85f43e62240145a656b1e5285b14239'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 25 00:25:12 2015 +0100| [fa80b76b110c663809671f7254bc07513710c061] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa80b76b110c663809671f7254bc07513710c061
---