[FFmpeg-cvslog] lavf/utils: dont't explicitly check AVIOContext.error
Anton Khirnov
git
Tue Mar 15 16:55:26 CET 2011
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Mon Mar 14 20:38:54 2011 +0100| [75b9ed04b977bfd467816f7e60c6511ef89b8a2b] | committer: Ronald S. Bultje
lavf/utils: dont't explicitly check AVIOContext.error
The error should be caught in write_packet()/write_trailer()
Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=75b9ed04b977bfd467816f7e60c6511ef89b8a2b
---
libavformat/utils.c | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 918b07d..902a170 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2988,8 +2988,6 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt)
return ret;
ret= s->oformat->write_packet(s, pkt);
- if(!ret)
- ret= url_ferror(s->pb);
return ret;
}
@@ -3111,8 +3109,6 @@ int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt){
if(ret<0)
return ret;
- if(url_ferror(s->pb))
- return url_ferror(s->pb);
}
}
@@ -3134,15 +3130,11 @@ int av_write_trailer(AVFormatContext *s)
if(ret<0)
goto fail;
- if(url_ferror(s->pb))
- goto fail;
}
if(s->oformat->write_trailer)
ret = s->oformat->write_trailer(s);
fail:
- if(ret == 0)
- ret=url_ferror(s->pb);
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