virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avformat/tee: Simplify code by using avio_closep()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-01-09 13:40:09 +01:00
parent 643dee846a
commit ef3a6a48b5
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/tee.c
View File

@@ -305,8 +305,7 @@ static void close_slaves(AVFormatContext *avf)
av_freep(&tee->slaves[i].stream_map); av_freep(&tee->slaves[i].stream_map);
av_freep(&tee->slaves[i].bsfs); av_freep(&tee->slaves[i].bsfs);
avio_close(avf2->pb); avio_closep(&avf2->pb);
avf2->pb = NULL;
avformat_free_context(avf2); avformat_free_context(avf2);
tee->slaves[i].avf = NULL; tee->slaves[i].avf = NULL;
} }
@@ -437,10 +436,9 @@ static int tee_write_trailer(AVFormatContext *avf)
if (!ret_all) if (!ret_all)
ret_all = ret; ret_all = ret;
if (!(avf2->oformat->flags & AVFMT_NOFILE)) { if (!(avf2->oformat->flags & AVFMT_NOFILE)) {
if ((ret = avio_close(avf2->pb)) < 0) if ((ret = avio_closep(&avf2->pb)) < 0)
if (!ret_all) if (!ret_all)
ret_all = ret; ret_all = ret;
avf2->pb = NULL;
} }
} }
close_slaves(avf); close_slaves(avf);