Merge commit 'c13ab42a0a3979b2c292b2315487f5f5e14ba26b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Mar 2015 00:19:52 +0000 (01:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Mar 2015 00:20:25 +0000 (01:20 +0100)
commit2eb890aab22d9cc20df140615008a7c4eec9ac7b
tree068dbe28453a9823722fc40575cee683fc2871de
parent9575d8a652c07ac26dc797f78a53ec82f6db38fc
parentc13ab42a0a3979b2c292b2315487f5f5e14ba26b
Merge commit 'c13ab42a0a3979b2c292b2315487f5f5e14ba26b'

* commit 'c13ab42a0a3979b2c292b2315487f5f5e14ba26b':
  rtpdec_qt: Use a local variable instead of RTP_FLAG_KEY

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