Browse Source

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>
tags/n2.1
Michael Niedermayer 12 years ago
parent
commit
5bb3ef3b36
1 changed files with 5 additions and 0 deletions
  1. +5
    -0
      libavformat/rtmpproto.c

+ 5
- 0
libavformat/rtmpproto.c View File

@@ -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;
}


Loading…
Cancel
Save