ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Jan 9 13:40:09 2015 +0100| [ef3a6a48b56dce552f4bc8b60403d2d53484c2f8] | committer: Michael Niedermayer
avformat/tee: Simplify code by using avio_closep() Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ef3a6a48b56dce552f4bc8b60403d2d53484c2f8 --- libavformat/tee.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavformat/tee.c b/libavformat/tee.c index 681f943..e3d466a 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -305,8 +305,7 @@ static void close_slaves(AVFormatContext *avf) av_freep(&tee->slaves[i].stream_map); av_freep(&tee->slaves[i].bsfs); - avio_close(avf2->pb); - avf2->pb = NULL; + avio_closep(&avf2->pb); avformat_free_context(avf2); tee->slaves[i].avf = NULL; } @@ -437,10 +436,9 @@ static int tee_write_trailer(AVFormatContext *avf) if (!ret_all) ret_all = ret; if (!(avf2->oformat->flags & AVFMT_NOFILE)) { - if ((ret = avio_close(avf2->pb)) < 0) + if ((ret = avio_closep(&avf2->pb)) < 0) if (!ret_all) ret_all = ret; - avf2->pb = NULL; } } close_slaves(avf); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
