RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 08:42:39 +00:00
Code Issues Projects Releases Wiki Activity

flvdec: Eliminate completely silly goto

Browse Source
This commit is contained in:
Diego Biurrun 2013-07-31 23:56:26 +02:00
parent e4529df944
commit f900f35ac8
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/flvdec.c
View File

@ -636,35 +636,32 @@ static void clear_index_entries(AVFormatContext *s, int64_t pos)
static int flv_data_packet(AVFormatContext *s, AVPacket *pkt, static int flv_data_packet(AVFormatContext *s, AVPacket *pkt,
int64_t dts, int64_t next) int64_t dts, int64_t next)
{ {
int ret = AVERROR_INVALIDDATA, i;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
AVStream *st = NULL; AVStream *st = NULL;
AMFDataType type; AMFDataType type;
char buf[20]; char buf[20];
int length; int ret, i, length;
type = avio_r8(pb); type = avio_r8(pb);
if (type == AMF_DATA_TYPE_MIXEDARRAY) if (type == AMF_DATA_TYPE_MIXEDARRAY)
avio_seek(pb, 4, SEEK_CUR); avio_seek(pb, 4, SEEK_CUR);
else if (type != AMF_DATA_TYPE_OBJECT) else if (type != AMF_DATA_TYPE_OBJECT)
goto out; return AVERROR_INVALIDDATA;
amf_get_string(pb, buf, sizeof(buf)); amf_get_string(pb, buf, sizeof(buf));
if (strcmp(buf, "type") || avio_r8(pb) != AMF_DATA_TYPE_STRING) if (strcmp(buf, "type") || avio_r8(pb) != AMF_DATA_TYPE_STRING)
goto out; return AVERROR_INVALIDDATA;
amf_get_string(pb, buf, sizeof(buf)); amf_get_string(pb, buf, sizeof(buf));
// FIXME parse it as codec_id // FIXME parse it as codec_id
amf_get_string(pb, buf, sizeof(buf)); amf_get_string(pb, buf, sizeof(buf));
if (strcmp(buf, "text") || avio_r8(pb) != AMF_DATA_TYPE_STRING) if (strcmp(buf, "text") || avio_r8(pb) != AMF_DATA_TYPE_STRING)
goto out; return AVERROR_INVALIDDATA;
length = avio_rb16(pb); length = avio_rb16(pb);
ret = av_get_packet(s->pb, pkt, length); ret = av_get_packet(s->pb, pkt, length);
if (ret < 0) { if (ret < 0)
ret = AVERROR(EIO); return AVERROR(EIO);
goto out;
}
for (i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
st = s->streams[i]; st = s->streams[i];
@ -675,7 +672,7 @@ static int flv_data_packet(AVFormatContext *s, AVPacket *pkt,
if (i == s->nb_streams) { if (i == s->nb_streams) {
st = create_stream(s, AVMEDIA_TYPE_DATA); st = create_stream(s, AVMEDIA_TYPE_DATA);
if (!st) if (!st)
goto out; return AVERROR_INVALIDDATA;
st->codec->codec_id = AV_CODEC_ID_TEXT; st->codec->codec_id = AV_CODEC_ID_TEXT;
} }
@ -688,7 +685,6 @@ static int flv_data_packet(AVFormatContext *s, AVPacket *pkt,
avio_seek(s->pb, next + 4, SEEK_SET); avio_seek(s->pb, next + 4, SEEK_SET);
out:
return ret; return ret;
} }