Merge commit '1dc19729e92a96620000e09eba8e58cb458c9486'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Mar 2015 18:14:45 +0000 (19:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Mar 2015 18:14:48 +0000 (19:14 +0100)
commit634ce8ddad6b2c03d24bce12ba69f9217729d3f5
tree12b6210573546e9bbf8ef7d437020e3c30eeb239
parent1c9f2ebdcd073a0f23c32c237182c4c81d91056a
parent1dc19729e92a96620000e09eba8e58cb458c9486
Merge commit '1dc19729e92a96620000e09eba8e58cb458c9486'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtpdec_asf.c