Merge commit '15621cbbe4ed88409ef40257afaf239487964e98'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Mar 2015 00:12:13 +0000 (01:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Mar 2015 00:12:19 +0000 (01:12 +0100)
* commit '15621cbbe4ed88409ef40257afaf239487964e98':
  rtpdec_asf: Don't set RTP_FLAG_KEY

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

Simple merge