mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-19 21:06:42 +00:00
Merge commit '8921e32f730c191543b84e61338bc9d549aa05a3'
* commit '8921e32f730c191543b84e61338bc9d549aa05a3': rtmpproto: Readjust the end of the flv buffer if handle_metadata exited early Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
5bb3ef3b36
@ -2226,6 +2226,11 @@ static int handle_metadata(RTMPContext *rt, RTMPPacket *pkt)
|
|||||||
next += size + 3 + 4;
|
next += size + 3 + 4;
|
||||||
p += size + 3 + 4;
|
p += size + 3 + 4;
|
||||||
}
|
}
|
||||||
|
if (p != rt->flv_data + rt->flv_size) {
|
||||||
|
av_log(NULL, AV_LOG_WARNING, "Incomplete flv packets in "
|
||||||
|
"RTMP_PT_METADATA packet\n");
|
||||||
|
rt->flv_size = p - rt->flv_data;
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user