[FFmpeg-cvslog] lavf/utils: replace deprecated url_ferror.

Nicolas George git at videolan.org
Sun Sep 25 11:43:20 CEST 2011


ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Wed Sep 14 19:54:48 2011 +0200| [73a528748296c4b2c807d6610d873f97fe7fc428] | committer: Nicolas George

lavf/utils: replace deprecated url_ferror.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=73a528748296c4b2c807d6610d873f97fe7fc428
---

 libavformat/utils.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index b8a097e..cba397b 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3359,8 +3359,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;
     }
 }
 
@@ -3384,7 +3384,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;
     }
 
@@ -3392,7 +3392,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);



More information about the ffmpeg-cvslog mailing list