Merge branch 'master' into dev

This commit is contained in:
Romain Vimont
2019-07-31 00:14:17 +02:00
8 changed files with 77 additions and 39 deletions

View File

@@ -151,9 +151,6 @@ recorder_write_header(struct recorder *recorder, const AVPacket *packet) {
int ret = avformat_write_header(recorder->ctx, NULL);
if (ret < 0) {
LOGE("Failed to write header to %s", recorder->filename);
SDL_free(extradata);
avio_closep(&recorder->ctx->pb);
avformat_free_context(recorder->ctx);
return false;
}

View File

@@ -198,7 +198,7 @@ run_stream(void *data) {
if (stream->recorder && !recorder_open(stream->recorder, codec)) {
LOGE("Could not open recorder");
goto finally_close_input;
goto finally_close_decoder;
}
AVPacket packet;
@@ -248,6 +248,10 @@ quit:
if (stream->recorder) {
recorder_close(stream->recorder);
}
finally_close_decoder:
if (stream->decoder) {
decoder_close(stream->decoder);
}
finally_close_input:
avformat_close_input(&format_ctx);
finally_free_avio_ctx: