Browse Source

avformat/tee: Simplify code by using avio_closep()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.6
Michael Niedermayer 11 years ago
parent
commit
ef3a6a48b5
1 changed files with 2 additions and 4 deletions
  1. +2
    -4
      libavformat/tee.c

+ 2
- 4
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].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);


Loading…
Cancel
Save