Display and control your Android device
Do not call avcodec_close()
Romain Vimont1e3deabd6c9e
diff --git a/app/src/demuxer.c b/app/src/demuxer.cindex c27ea292..7223b553 100644--- a/app/src/demuxer.c+++ b/app/src/demuxer.c@@ -278,7 +278,6 @@ run_demuxer(void *data) {finally_close_sinks:sc_packet_source_sinks_close(&demuxer->packet_source);finally_free_context:- // This also calls avcodec_close() internallyavcodec_free_context(&codec_ctx);end:demuxer->cbs->on_ended(demuxer, status, demuxer->cbs_userdata);diff --git a/app/src/icon.c b/app/src/icon.cindex 0dddefa3..a76a85c9 100644--- a/app/src/icon.c+++ b/app/src/icon.c@@ -117,21 +117,21 @@ decode_image(const char *path) {AVFrame *frame = av_frame_alloc();if (!frame) {LOG_OOM();- goto close_codec;+ goto free_codec_ctx;}AVPacket *packet = av_packet_alloc();if (!packet) {LOG_OOM();av_frame_free(&frame);- goto close_codec;+ goto free_codec_ctx;}if (av_read_frame(ctx, packet) < 0) {LOGE("Could not read frame");av_packet_free(&packet);av_frame_free(&frame);- goto close_codec;+ goto free_codec_ctx;}int ret;@@ -139,22 +139,20 @@ decode_image(const char *path) {LOGE("Could not send icon packet: %d", ret);av_packet_free(&packet);av_frame_free(&frame);- goto close_codec;+ goto free_codec_ctx;}if ((ret = avcodec_receive_frame(codec_ctx, frame)) != 0) {LOGE("Could not receive icon frame: %d", ret);av_packet_free(&packet);av_frame_free(&frame);- goto close_codec;+ goto free_codec_ctx;}av_packet_free(&packet);result = frame;-close_codec:- avcodec_close(codec_ctx);free_codec_ctx:avcodec_free_context(&codec_ctx);close_input:diff --git a/app/src/v4l2_sink.c b/app/src/v4l2_sink.cindex 3b3eb8d0..087e9af4 100644--- a/app/src/v4l2_sink.c+++ b/app/src/v4l2_sink.c@@ -240,7 +240,7 @@ sc_v4l2_sink_open(struct sc_v4l2_sink *vs, const AVCodecContext *ctx) {vs->frame = av_frame_alloc();if (!vs->frame) {LOG_OOM();- goto error_avcodec_close;+ goto error_avcodec_free_context;}vs->packet = av_packet_alloc();@@ -268,8 +268,6 @@ error_av_packet_free:av_packet_free(&vs->packet);error_av_frame_free:av_frame_free(&vs->frame);-error_avcodec_close:- avcodec_close(vs->encoder_ctx);error_avcodec_free_context:avcodec_free_context(&vs->encoder_ctx);error_avio_close:@@ -297,7 +295,6 @@ sc_v4l2_sink_close(struct sc_v4l2_sink *vs) {av_packet_free(&vs->packet);av_frame_free(&vs->frame);- avcodec_close(vs->encoder_ctx);avcodec_free_context(&vs->encoder_ctx);avio_close(vs->format_ctx->pb);avformat_free_context(vs->format_ctx);