RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

wav demuxer: return AVERROR_EOF instead of AVERROR(EIO) when the end of 

the file is reached normally, without any error.

Originally committed as revision 20143 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2009-10-02 07:27:08 +00:00
parent e581b6288f
commit 3fcb5113c6
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/wav.c
View File

@ -256,7 +256,7 @@ static int wav_read_packet(AVFormatContext *s,
else
left = find_tag(s->pb, MKTAG('d', 'a', 't', 'a'));
if (left < 0)
return AVERROR(EIO);
return AVERROR_EOF;
wav->data_end= url_ftell(s->pb) + left;
}

24
tests/seek.regression.ref
View File

@ -3740,51 +3740,51 @@ ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:44 size:4096 flags:1
ret: 0 st:-1 ts:-1.000000 flags:0
ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:44 size:4096 flags:1
ret: 0 st:-1 ts:1.894167 flags:1
ret:-5
ret:-32
ret: 0 st: 0 ts:0.788345 flags:0
ret: 0 st: 0 dts:0.788345 pts:0.788345 pos:69576 size:4096 flags:1
ret: 0 st: 0 ts:-0.317506 flags:1
ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:44 size:4096 flags:1
ret: 0 st:-1 ts:2.576668 flags:0
ret:-5
ret:-32
ret: 0 st:-1 ts:1.470835 flags:1
ret:-5
ret:-32
ret: 0 st: 0 ts:0.365011 flags:0
ret: 0 st: 0 dts:0.365011 pts:0.365011 pos:32238 size:4096 flags:1
ret: 0 st: 0 ts:-0.740839 flags:1
ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:44 size:4096 flags:1
ret: 0 st:-1 ts:2.153336 flags:0
ret:-5
ret:-32
ret: 0 st:-1 ts:1.047503 flags:1
ret:-5
ret:-32
ret: 0 st: 0 ts:-0.058322 flags:0
ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:44 size:4096 flags:1
ret: 0 st: 0 ts:2.835828 flags:1
ret:-5
ret:-32
ret: 0 st:-1 ts:1.730004 flags:0
ret:-5
ret:-32
ret: 0 st:-1 ts:0.624171 flags:1
ret: 0 st: 0 dts:0.624172 pts:0.624172 pos:55096 size:4096 flags:1
ret: 0 st: 0 ts:-0.481655 flags:0
ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:44 size:4096 flags:1
ret: 0 st: 0 ts:2.412494 flags:1
ret:-5
ret:-32
ret: 0 st:-1 ts:1.306672 flags:0
ret:-5
ret:-32
ret: 0 st:-1 ts:0.200839 flags:1
ret: 0 st: 0 dts:0.200839 pts:0.200839 pos:17758 size:4096 flags:1
ret: 0 st: 0 ts:-0.904989 flags:0
ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:44 size:4096 flags:1
ret: 0 st: 0 ts:1.989184 flags:1
ret:-5
ret:-32
ret: 0 st:-1 ts:0.883340 flags:0
ret: 0 st: 0 dts:0.883333 pts:0.883333 pos:77954 size:4096 flags:1
ret: 0 st:-1 ts:-0.222493 flags:1
ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:44 size:4096 flags:1
ret: 0 st: 0 ts:2.671678 flags:0
ret:-5
ret:-32
ret: 0 st: 0 ts:1.565850 flags:1
ret:-5
ret:-32
ret: 0 st:-1 ts:0.460008 flags:0
ret: 0 st: 0 dts:0.460000 pts:0.460000 pos:40616 size:4096 flags:1
ret: 0 st:-1 ts:-0.645825 flags:1