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)
* commit '1dc19729e92a96620000e09eba8e58cb458c9486':
  rtpdec_asf: Don't free the payload context in the .close function

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

Simple merge