highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use more appropriate return values in txd demuxer.

Browse Source 
Originally committed as revision 22703 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2010-03-27 19:10:24 +00:00
parent 36031c2033
commit d14f5391c1
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/txd.c
View File

@ -62,10 +62,10 @@ next_chunk:
marker = get_le32(pb); marker = get_le32(pb);
if (url_feof(s->pb)) if (url_feof(s->pb))
return AVERROR(EIO); return AVERROR_EOF;
if (marker != TXD_MARKER && marker != TXD_MARKER2) { if (marker != TXD_MARKER && marker != TXD_MARKER2) {
av_log(s, AV_LOG_ERROR, "marker does not match\n"); av_log(s, AV_LOG_ERROR, "marker does not match\n");
return AVERROR(EIO); return AVERROR_INVALIDDATA;
} }
switch (id) { switch (id) {
@ -79,13 +79,15 @@ next_chunk:
goto next_chunk; goto next_chunk;
default: default:
av_log(s, AV_LOG_ERROR, "unknown chunk id %i\n", id); av_log(s, AV_LOG_ERROR, "unknown chunk id %i\n", id);
return AVERROR(EIO); return AVERROR_INVALIDDATA;
} }
ret = av_get_packet(s->pb, pkt, chunk_size); ret = av_get_packet(s->pb, pkt, chunk_size);
if (ret < 0)
return ret;
pkt->stream_index = 0; pkt->stream_index = 0;
return ret <= 0 ? AVERROR(EIO) : ret; return 0;
} }
AVInputFormat txd_demuxer = AVInputFormat txd_demuxer =