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)
commit9575d8a652c07ac26dc797f78a53ec82f6db38fc
tree306cfde8daebd0c8e53127c82096c29f113fe589
parent7c2e35d1d0f1626917a8b0fb56916f2ef929762d
parent15621cbbe4ed88409ef40257afaf239487964e98
Merge commit '15621cbbe4ed88409ef40257afaf239487964e98'

* commit '15621cbbe4ed88409ef40257afaf239487964e98':
  rtpdec_asf: Don't set RTP_FLAG_KEY

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