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)
* qatar/master:
  rtmp: Do not misuse memcmp

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

Simple merge
Simple merge
Simple merge