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)
commitc9eb2ce085327ef9631602d215ece53888bc4e32
treea03079b6efc36862fc55c82e7c1c7001c8cf8230
parent953a4191b8122d404bcd7db13e686c3caa66ab08
parent666ed7eda1d568638689ac7b0cef0a9e564ffbdf
Merge commit '666ed7eda1d568638689ac7b0cef0a9e564ffbdf'

* commit '666ed7eda1d568638689ac7b0cef0a9e564ffbdf':
  rtmp: Drop an unneeded warning

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