[FFmpeg-cvslog] avformat/img2enc: minor simplification
Marton Balint
git at videolan.org
Fri Jan 3 19:12:18 EET 2020
ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Thu Dec 26 22:58:45 2019 +0100| [beb7f93b238f1b80ef0ad0e794a0f0ccc0625f03] | committer: Marton Balint
avformat/img2enc: minor simplification
Signed-off-by: Marton Balint <cus at passwd.hu>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=beb7f93b238f1b80ef0ad0e794a0f0ccc0625f03
---
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)
More information about the ffmpeg-cvslog
mailing list