From edeaf6f3a4d7983f3b86465920c7d425dd290362 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 8 Jan 2015 20:10:47 +0100 Subject: avformat/mlvdec: Simplify code by using avio_closep() Signed-off-by: Michael Niedermayer --- libavformat/mlvdec.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'libavformat/mlvdec.c') diff --git a/libavformat/mlvdec.c b/libavformat/mlvdec.c index 06ea7b3ea5..93d54e01e8 100644 --- a/libavformat/mlvdec.c +++ b/libavformat/mlvdec.c @@ -342,16 +342,14 @@ static int read_header(AVFormatContext *avctx) break; if (check_file_header(mlv->pb[i], guid) < 0) { av_log(avctx, AV_LOG_WARNING, "ignoring %s; bad format or guid mismatch\n", filename); - avio_close(mlv->pb[i]); - mlv->pb[i] = NULL; + avio_closep(&mlv->pb[i]); continue; } av_log(avctx, AV_LOG_INFO, "scanning %s\n", filename); ret = scan_file(avctx, vst, ast, i); if (ret < 0) { av_log(avctx, AV_LOG_WARNING, "ignoring %s; %s\n", filename, av_err2str(ret)); - avio_close(mlv->pb[i]); - mlv->pb[i] = NULL; + avio_closep(&mlv->pb[i]); continue; } } -- cgit v1.2.3