asfdec: factor out seeking to the Data Object outside while
return INVALIDDARA if Data Object was not found Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
parent
ecee1148af
commit
5655236a67
@ -1652,17 +1652,13 @@ static int asf_read_header(AVFormatContext *s)
|
|||||||
*/
|
*/
|
||||||
while (1) {
|
while (1) {
|
||||||
// for the cases when object size is invalid
|
// for the cases when object size is invalid
|
||||||
if (avio_tell(pb) == asf->offset) {
|
if (avio_tell(pb) == asf->offset)
|
||||||
if (asf->data_reached)
|
|
||||||
avio_seek(pb, asf->first_packet_offset, SEEK_SET);
|
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
asf->offset = avio_tell(pb);
|
asf->offset = avio_tell(pb);
|
||||||
if ((ret = ff_get_guid(pb, &guid)) < 0) {
|
if ((ret = ff_get_guid(pb, &guid)) < 0) {
|
||||||
if (ret == AVERROR_EOF && asf->data_reached) {
|
if (ret == AVERROR_EOF && asf->data_reached)
|
||||||
avio_seek(pb, asf->first_packet_offset, SEEK_SET);
|
|
||||||
break;
|
break;
|
||||||
} else
|
else
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
g = find_guid(guid);
|
g = find_guid(guid);
|
||||||
@ -1679,6 +1675,13 @@ static int asf_read_header(AVFormatContext *s)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!asf->data_reached) {
|
||||||
|
av_log(s, AV_LOG_ERROR, "Data Object was not found.\n");
|
||||||
|
return AVERROR_INVALIDDATA;
|
||||||
|
}
|
||||||
|
if (pb->seekable)
|
||||||
|
avio_seek(pb, asf->first_packet_offset, SEEK_SET);
|
||||||
|
|
||||||
for (i = 0; i < asf->nb_streams; i++) {
|
for (i = 0; i < asf->nb_streams; i++) {
|
||||||
const char *rfc1766 = asf->asf_sd[asf->asf_st[i]->lang_idx].langs;
|
const char *rfc1766 = asf->asf_sd[asf->asf_st[i]->lang_idx].langs;
|
||||||
AVStream *st = s->streams[asf->asf_st[i]->index];
|
AVStream *st = s->streams[asf->asf_st[i]->index];
|
||||||
|
Loading…
Reference in New Issue
Block a user