Merge commit '666ed7eda1d568638689ac7b0cef0a9e564ffbdf'
* commit '666ed7eda1d568638689ac7b0cef0a9e564ffbdf': rtmp: Drop an unneeded warning Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
		@@ -1395,8 +1395,6 @@ static int rtmp_server_handshake(URLContext *s, RTMPContext *rt)
 | 
				
			|||||||
        av_log(s, AV_LOG_ERROR, "RTMP Handshake C1 Error\n");
 | 
					        av_log(s, AV_LOG_ERROR, "RTMP Handshake C1 Error\n");
 | 
				
			||||||
        return ret;
 | 
					        return ret;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    if (zeroes)
 | 
					 | 
				
			||||||
        av_log(s, AV_LOG_WARNING, "Erroneous C1 Message zero != 0\n");
 | 
					 | 
				
			||||||
    /* Send S1 */
 | 
					    /* Send S1 */
 | 
				
			||||||
    /* By now same epoch will be sent */
 | 
					    /* By now same epoch will be sent */
 | 
				
			||||||
    hs_my_epoch = hs_epoch;
 | 
					    hs_my_epoch = hs_epoch;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user