From 17fcb1709fd04433a05c6f60023856eebf817dd5 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 10 Dec 2006 17:38:16 +0000 Subject: use amf_get_string() Originally committed as revision 7271 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/flvdec.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'libavformat/flvdec.c') diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 4c1c9624ee..c49fe8eae7 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -135,20 +135,14 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) int type, len; double d= 0; - len= get_be16(&s->pb); - if(len >= sizeof(tmp) || !len) + if(amf_get_string(&s->pb, tmp, sizeof(tmp))<0) break; - get_buffer(&s->pb, tmp, len); - tmp[len]=0; type= get_byte(&s->pb); if(type == AMF_DATA_TYPE_NUMBER){ d= av_int2dbl(get_be64(&s->pb)); }else if(type == AMF_DATA_TYPE_STRING){ - len= get_be16(&s->pb); - if(len >= sizeof(tmp)) - break; - url_fskip(&s->pb, len); + amf_get_string(&s->pb, NULL, 0); }else if(type == AMF_DATA_TYPE_MIXEDARRAY){ //array break; -- cgit v1.2.3