diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-04 14:24:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-04 14:25:03 +0200 |
| commit | 5bb3ef3b369a7be87c25f3a9050edd4e7c2364d8 (patch) | |
| tree | 1d2bef7134ee77490ce06634d54f6216003fe0a0 /libavformat/rtmpproto.c | |
| parent | b8e44118b13614f74c13a5540fdac4a5f097b70d (diff) | |
| parent | 8921e32f730c191543b84e61338bc9d549aa05a3 (diff) | |
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>
Diffstat (limited to 'libavformat/rtmpproto.c')
| -rw-r--r-- | libavformat/rtmpproto.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 1207519219..e7d29aa3c7 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -2226,6 +2226,11 @@ static int handle_metadata(RTMPContext *rt, RTMPPacket *pkt) next += 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; } |