aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2011-09-14 19:54:48 +0200
committerNicolas George <nicolas.george@normalesup.org>2011-09-25 11:18:41 +0200
commit73a528748296c4b2c807d6610d873f97fe7fc428 (patch)
tree89152b5f0e924420f211f75e83df611cb2bfae92
parent86af962830d8e8cba3c3e5e6bfecb7bb3aab8129 (diff)
downloadffmpeg-73a528748296c4b2c807d6610d873f97fe7fc428.tar.gz
lavf/utils: replace deprecated url_ferror.
-rw-r--r--libavformat/utils.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index b8a097ecee..cba397b0ae 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);