[FFmpeg-devel] [PATCH 4/4] lavf/utils: replace deprecated url_ferror.
Nicolas George
nicolas.george at normalesup.org
Wed Sep 14 21:17:15 CEST 2011
Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
---
libavformat/utils.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 9f1934a..472e81a 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3348,8 +3348,8 @@ int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt){
if(ret<0)
return ret;
- if(url_ferror(s->pb))
- return url_ferror(s->pb);
+ if(s->pb && s->pb->error)
+ return s->pb->error;
}
}
@@ -3373,7 +3373,7 @@ int av_write_trailer(AVFormatContext *s)
if(ret<0)
goto fail;
- if(url_ferror(s->pb))
+ if(s->pb && s->pb->error)
goto fail;
}
@@ -3381,7 +3381,7 @@ int av_write_trailer(AVFormatContext *s)
ret = s->oformat->write_trailer(s);
fail:
if(ret == 0)
- ret=url_ferror(s->pb);
+ ret = s->pb ? s->pb->error : 0;
for(i=0;i<s->nb_streams;i++) {
av_freep(&s->streams[i]->priv_data);
av_freep(&s->streams[i]->index_entries);
--
1.7.5.4
More information about the ffmpeg-devel
mailing list