1
mirror of https://code.videolan.org/videolan/dav1d synced 2024-09-27 11:50:24 +02:00

tools/dav1d: don't call write_header and write_trailer when it's not needed

This commit is contained in:
James Almer 2018-10-27 10:50:25 -03:00
parent 2118bc9fa3
commit 8d5a812190
No known key found for this signature in database
GPG Key ID: 146301AD737659E0
2 changed files with 3 additions and 14 deletions

View File

@ -31,26 +31,14 @@
typedef struct MuxerPriv NullOutputContext;
static int null_open(NullOutputContext *const c, const char *const file,
const Dav1dPictureParameters *const p,
const unsigned fps[2])
{
return 0;
}
static int null_write(NullOutputContext *const c, Dav1dPicture *const p) {
dav1d_picture_unref(p);
return 0;
}
static void null_close(NullOutputContext *const c) {
}
const Muxer null_muxer = {
.priv_data_size = 0,
.name = "null",
.extension = "null",
.write_header = null_open,
.write_picture = null_write,
.write_trailer = null_close,
};

View File

@ -118,7 +118,7 @@ int output_open(MuxerContext **const c_out,
}
c->impl = impl;
c->data = (MuxerPriv *) &c[1];
if ((res = impl->write_header(c->data, filename, p, fps)) < 0) {
if (impl->write_header && (res = impl->write_header(c->data, filename, p, fps)) < 0) {
free(c);
return res;
}
@ -137,6 +137,7 @@ int output_write(MuxerContext *const ctx, Dav1dPicture *const p) {
}
void output_close(MuxerContext *const ctx) {
if (ctx->impl->write_trailer)
ctx->impl->write_trailer(ctx->data);
free(ctx);
}