aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-09-17 11:28:12 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-09-17 11:28:16 +0200
commitc9eb2ce085327ef9631602d215ece53888bc4e32 (patch)
treea03079b6efc36862fc55c82e7c1c7001c8cf8230
parent953a4191b8122d404bcd7db13e686c3caa66ab08 (diff)
parent666ed7eda1d568638689ac7b0cef0a9e564ffbdf (diff)
downloadffmpeg-c9eb2ce085327ef9631602d215ece53888bc4e32.tar.gz
Merge commit '666ed7eda1d568638689ac7b0cef0a9e564ffbdf'
* commit '666ed7eda1d568638689ac7b0cef0a9e564ffbdf': rtmp: Drop an unneeded warning Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/rtmpproto.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index d81a6a1f65..b89d7913f9 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -1395,8 +1395,6 @@ static int rtmp_server_handshake(URLContext *s, RTMPContext *rt)
av_log(s, AV_LOG_ERROR, "RTMP Handshake C1 Error\n");
return ret;
}
- if (zeroes)
- av_log(s, AV_LOG_WARNING, "Erroneous C1 Message zero != 0\n");
/* Send S1 */
/* By now same epoch will be sent */
hs_my_epoch = hs_epoch;