lavf/utils: replace deprecated url_ferror.
authorNicolas George <nicolas.george@normalesup.org>
Wed, 14 Sep 2011 17:54:48 +0000 (19:54 +0200)
committerNicolas George <nicolas.george@normalesup.org>
Sun, 25 Sep 2011 09:18:41 +0000 (11:18 +0200)
libavformat/utils.c

index b8a097e..cba397b 100644 (file)
@@ -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);