Merge commit '666ed7eda1d568638689ac7b0cef0a9e564ffbdf'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 09:28:12 +0000 (11:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 09:28:16 +0000 (11:28 +0200)
* commit '666ed7eda1d568638689ac7b0cef0a9e564ffbdf':
  rtmp: Drop an unneeded warning

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

Simple merge