generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove double check of pb->read_seek

Browse Source 
Originally committed as revision 11278 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2007-12-20 00:25:18 +00:00
parent 17e45b377c
commit fd2982a0a0
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/asf.c
View File

@ -1050,10 +1050,11 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int
return -1; return -1;
/* Try using the protocol's read_seek if available */ /* Try using the protocol's read_seek if available */
if(s->pb && s->pb->read_seek) { if(s->pb) {
int ret = av_url_read_fseek(s->pb, stream_index, pts, flags); int ret = av_url_read_fseek(s->pb, stream_index, pts, flags);
if(ret >= 0) if(ret >= 0)
asf_reset_header(s); asf_reset_header(s);
if (ret != AVERROR(ENOSYS))
return ret; return ret;
} }

4
libavformat/utils.c
View File

@ -2042,7 +2042,7 @@ int av_read_play(AVFormatContext *s)
{ {
if (s->iformat->read_play) if (s->iformat->read_play)
return s->iformat->read_play(s); return s->iformat->read_play(s);
if (s->pb && s->pb->read_pause) if (s->pb)
return av_url_read_fpause(s->pb, 0); return av_url_read_fpause(s->pb, 0);
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
} }
@ -2051,7 +2051,7 @@ int av_read_pause(AVFormatContext *s)
{ {
if (s->iformat->read_pause) if (s->iformat->read_pause)
return s->iformat->read_pause(s); return s->iformat->read_pause(s);
if (s->pb && s->pb->read_pause) if (s->pb)
return av_url_read_fpause(s->pb, 1); return av_url_read_fpause(s->pb, 1);
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
} }