Browse Source
remove double check of pb->read_seek
Originally committed as revision 11278 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
Aurelien Jacobs
17 years ago
2 changed files with 4 additions and 3 deletions
Unified View
Diff Options
-
+2 -1libavformat/asf.c
-
+2 -2libavformat/utils.c
+ 2
- 1
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; | ||||
| } | } | ||||
+ 2
- 2
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); | ||||
| } | } | ||||