Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 09:54:32 +0000 (11:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 09:54:37 +0000 (11:54 +0200)
commit15c92f8c486a91ca2bd8607a088bee2219c34452
treebf238631bc90e87fea4cf9983faadac9bd854317
parent99091ff217440daa33fddcf66170e1a6d630c3a4
parent5718e3487ba3b26aba341070be0b6b0b4de45ea3
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmp: Do not misuse memcmp

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