[FFmpeg-devel] [PATCH 6/8] avformat/img2enc: minor simplification
Marton Balint
cus at passwd.hu
Fri Dec 27 23:14:09 EET 2019
Signed-off-by: Marton Balint <cus at passwd.hu>
---
libavformat/img2enc.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c
index 14e6d641f9..718c9929f7 100644
--- a/libavformat/img2enc.c
+++ b/libavformat/img2enc.c
@@ -92,18 +92,16 @@ static int write_muxed_file(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt)
st->id = pkt->stream_index;
fmt->pb = pb;
+
if ((ret = av_packet_ref(&pkt2, pkt)) < 0 ||
(ret = avcodec_parameters_copy(st->codecpar, par)) < 0 ||
(ret = avformat_write_header(fmt, NULL)) < 0 ||
(ret = av_interleaved_write_frame(fmt, &pkt2)) < 0 ||
- (ret = av_write_trailer(fmt)) < 0) {
- av_packet_unref(&pkt2);
- avformat_free_context(fmt);
- return ret;
- }
+ (ret = av_write_trailer(fmt))) {}
+
av_packet_unref(&pkt2);
avformat_free_context(fmt);
- return 0;
+ return ret;
}
static int write_packet_pipe(AVFormatContext *s, AVPacket *pkt)
--
2.16.4
More information about the ffmpeg-devel
mailing list