ffmpeg | branch: master | Clément Bœsch <[email protected]> | Wed Apr 26 16:34:51 2017 +0200| [65c3621d78c92b64d069ee32e34a50268c82c9a9] | committer: Clément Bœsch
Merge commit 'a4fec9a7eab842ea5eea1b1ee98624356cb31422' * commit 'a4fec9a7eab842ea5eea1b1ee98624356cb31422': rtmppkt: Check for packet size mismatches See 7d57ca4d9a75562fa32e40766211de150f8b3ee7 Merged-by: Clément Bœsch <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=65c3621d78c92b64d069ee32e34a50268c82c9a9 --- libavformat/rtmppkt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/rtmppkt.c b/libavformat/rtmppkt.c index cde0da78ce..833a3dbade 100644 --- a/libavformat/rtmppkt.c +++ b/libavformat/rtmppkt.c @@ -236,11 +236,11 @@ static int rtmp_packet_read_one_chunk(URLContext *h, RTMPPacket *p, timestamp += prev_pkt[channel_id].timestamp; if (prev_pkt[channel_id].read && size != prev_pkt[channel_id].size) { - av_log(NULL, AV_LOG_ERROR, "RTMP packet size mismatch %d != %d\n", - size, - prev_pkt[channel_id].size); + av_log(h, AV_LOG_ERROR, "RTMP packet size mismatch %d != %d\n", + size, prev_pkt[channel_id].size); ff_rtmp_packet_destroy(&prev_pkt[channel_id]); prev_pkt[channel_id].read = 0; + return AVERROR_INVALIDDATA; } if (!prev_pkt[channel_id].read) { ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
