summaryrefslogtreecommitdiff
path: root/libavformat/img2enc.c
diff options
context:
space:
mode:
authorMarton Balint <cus@passwd.hu>2019-12-26 22:58:45 +0100
committerMarton Balint <cus@passwd.hu>2020-01-03 11:23:55 +0100
commitbeb7f93b238f1b80ef0ad0e794a0f0ccc0625f03 (patch)
tree52d8cb6f840e16545ac20bcf350995fd0012980a /libavformat/img2enc.c
parent57df8839e1b2219a1646592fa4f96887268c2dfd (diff)
downloadffmpeg-beb7f93b238f1b80ef0ad0e794a0f0ccc0625f03.tar.gz
avformat/img2enc: minor simplification
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavformat/img2enc.c')
-rw-r--r--libavformat/img2enc.c10
1 files 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)