[FFmpeg-cvslog] Merge commit '1dc19729e92a96620000e09eba8e58cb458c9486'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar  4 19:14:45 2015 +0100| [634ce8ddad6b2c03d24bce12ba69f9217729d3f5] | committer: Michael Niedermayer

Merge commit '1dc19729e92a96620000e09eba8e58cb458c9486'

* commit '1dc19729e92a96620000e09eba8e58cb458c9486':
  rtpdec_asf: Don't free the payload context in the .close function

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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