From patchwork Sat Aug 6 23:35:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Anthony Lemieux X-Patchwork-Id: 37166 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a9:b0:8d:7f3b:94fc with SMTP id q41csp1016436pzg; Sat, 6 Aug 2022 16:35:58 -0700 (PDT) X-Google-Smtp-Source: AA6agR5rzLAUDyqH6GdPRFNtV+d/ff2Bw7/NMy87nxaDvF8FQvjovyC8WkA89d3Yf6vmx8PS+vdO X-Received: by 2002:a05:6402:2398:b0:43d:fd2c:b0a2 with SMTP id j24-20020a056402239800b0043dfd2cb0a2mr12346541eda.172.1659828958775; Sat, 06 Aug 2022 16:35:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659828958; cv=none; d=google.com; s=arc-20160816; b=GByDXlkpOd/5cuPirybIeG8q2uW48+V4iA963Qtlq1HT/TVuGIo8cMQO+OBbjKpnMz TVYsgrvaYDwRPNF2nD9tPmTeYLybyChjEWGYF+mxbvGxwBPygOY+mXjsXFreWl04wWS0 1MmpdkSSo8KNVQ8MV8GP21kk0UvsjGuBa3HC2EiCqjrOhJEile96X2nbRHBkVrDMyy8J PpsowcfQ+bjZtHRoW/72B12Eu70gJrNwUzJqRJexVPBiThxh8NbnOdAdOOWeTI7crTLY f4D31QKz3I36GIBWieK8ntI5VPjNp3ZLPfzuJWsaiykRIsQMQEErizTbKN3+LhP0OMUu E1aQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=s/40GnwFpsGet2TpJSbs+gRR94DiQEOV1IOVrTl8aww=; b=sWnODkV9Bx5o0A+6mWlnTFjJTRv11nvx8W7l4EJ54M919TleTYFfT6c0hp+LbvwW1K CpdsMVpi+yppDnfsQAMUs4PiTBRqcpsgmmjdICQNpdLjIDwUN1WPhIOOpRom1TYvYlhx SUVJTmOB0fTIn0XIRVBA/PepfiYF5WLVkQJZhXTflXQzUiiTHD/PDIHq6C+uzdEPRTpu jv7jI/R3Hqf5fl4DEldyxcqHufJEd7uOXd2XHjzKcmTABsSXSh9zMA7VQUVJg++PrmSw 6+s4V235RbmIOCTL77W8uf/T7yiRENUHtmua/8bSiuMio29QlhBOAsQ3RLFk0Wb9GUsK IiPw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id nb1-20020a1709071c8100b0070fc7c9d71dsi3396581ejc.989.2022.08.06.16.35.57; Sat, 06 Aug 2022 16:35:58 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8BA1F68B6EB; Sun, 7 Aug 2022 02:35:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CCA468B609 for ; Sun, 7 Aug 2022 02:35:48 +0300 (EEST) Received: by mail-pj1-f49.google.com with SMTP id o5-20020a17090a3d4500b001ef76490983so6082364pjf.2 for ; Sat, 06 Aug 2022 16:35:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=acLe+PRpX24Vxa9nEO7o1VcmKAXo0QOCfmZB0CnI1qA=; b=BB98uKQjqsuHYHQ0xSSbqFCt1BrvzjYQVZWykQA6j/TPF9BaX6akgGRV+JVEiRoU20 9xEjFX8eykabsJDwHlGHJKvDLd+wTmgD6qhUWjeWDOAx0x8kDdBYGGRRN2Mh76oVvAuI 8X60BwOAOuZTQe3VxO4PJMSUZSIF/qJsN6JvzVtSWlvULmxZEIhatNjPRKAkMqiViZAC hCPtoqTP7jrT9Ih1LktoRXI+KQTvZRGcm4tFac2H+KcTADinpUoYGRS27/gLbCm3/D9h 7WuQ04mFPd9wTcgRZRaNzSocpCsUacmwmLj4RT8gjC7ZyaJ/UB4j/iLSqOsEifT/ejSn VpgA== X-Gm-Message-State: ACgBeo0KNQdDVkyVZ4v7j2UNiT6PTnLKE0eG2guyJ4tBlVxezt6obIKZ XMk6+m2YcwG1pm3XXMV7EB8Raevn/dI= X-Received: by 2002:a17:90b:17c9:b0:1f3:3a7c:a3a7 with SMTP id me9-20020a17090b17c900b001f33a7ca3a7mr23264650pjb.76.1659828945621; Sat, 06 Aug 2022 16:35:45 -0700 (PDT) Received: from localhost (76-14-89-2.sf-cable.astound.net. [76.14.89.2]) by smtp.gmail.com with ESMTPSA id g14-20020aa79dce000000b0052d51acf115sm5616522pfq.157.2022.08.06.16.35.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Aug 2022 16:35:44 -0700 (PDT) Received: by localhost (sSMTP sendmail emulation); Sat, 06 Aug 2022 16:35:22 -0700 From: pal@sandflow.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 6 Aug 2022 16:35:19 -0700 Message-Id: <20220806233520.1154-1-pal@sandflow.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 1/2] avformat: refactor ff_stream_encode_params_copy() to stream_params_copy() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Pierre-Anthony Lemieux Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: L1J+FdghxxzW From: Pierre-Anthony Lemieux Addresses http://ffmpeg.org/pipermail/ffmpeg-devel/2022-August/299726.html --- libavformat/avformat.c | 66 ++++++++++++++++++++++++++++++++++++++++ libavformat/fifo.c | 8 ++--- libavformat/internal.h | 11 +++++++ libavformat/mux.h | 9 ------ libavformat/mux_utils.c | 28 ----------------- libavformat/segment.c | 6 ++-- libavformat/tee.c | 7 ++--- libavformat/webm_chunk.c | 6 ++-- 8 files changed, 86 insertions(+), 55 deletions(-) diff --git a/libavformat/avformat.c b/libavformat/avformat.c index 30d6ea6a49..19c7219471 100644 --- a/libavformat/avformat.c +++ b/libavformat/avformat.c @@ -235,6 +235,72 @@ int ff_stream_side_data_copy(AVStream *dst, const AVStream *src) return 0; } +/** + * Copy all stream parameters from source to destination stream, with the + * exception of the index field, which is usually set by avformat_new_stream(). + * + * @param dst pointer to destination AVStream + * @param src pointer to source AVStream + * @return >=0 on success, AVERROR code on error + */ +static int stream_params_copy(AVStream *dst, const AVStream *src) +{ + int ret; + + dst->id = src->id; + dst->time_base = src->time_base; + dst->start_time = src->start_time; + dst->duration = src->duration; + dst->nb_frames = src->nb_frames; + dst->disposition = src->disposition; + dst->discard = src->discard; + dst->sample_aspect_ratio = src->sample_aspect_ratio; + dst->avg_frame_rate = src->avg_frame_rate; + dst->event_flags = src->event_flags; + dst->r_frame_rate = src->r_frame_rate; + dst->pts_wrap_bits = src->pts_wrap_bits; + + av_dict_free(&dst->metadata); + ret = av_dict_copy(&dst->metadata, src->metadata, 0); + if (ret < 0) + return ret; + + ret = avcodec_parameters_copy(dst->codecpar, src->codecpar); + if (ret < 0) + return ret; + + ret = ff_stream_side_data_copy(dst, src); + if (ret < 0) + return ret; + + av_packet_unref(&dst->attached_pic); + if (src->attached_pic.data) { + ret = av_packet_ref(&dst->attached_pic, &src->attached_pic); + if (ret < 0) + return ret; + } + + return 0; +} + +AVStream *ff_stream_clone(AVFormatContext *dst_ctx, const AVStream *src) +{ + AVStream *st; + int ret; + + st = avformat_new_stream(dst_ctx, NULL); + if (!st) + return NULL; + + ret = stream_params_copy(st, src); + if (ret < 0) { + ff_remove_stream(dst_ctx, st); + return NULL; + } + + return st; +} + AVProgram *av_new_program(AVFormatContext *ac, int id) { AVProgram *program = NULL; diff --git a/libavformat/fifo.c b/libavformat/fifo.c index ead2bdc5cf..55d413b952 100644 --- a/libavformat/fifo.c +++ b/libavformat/fifo.c @@ -505,13 +505,11 @@ static int fifo_mux_init(AVFormatContext *avf, const AVOutputFormat *oformat, avf2->flags = avf->flags; for (i = 0; i < avf->nb_streams; ++i) { - AVStream *st = avformat_new_stream(avf2, NULL); + AVStream *st = NULL; + + st = ff_stream_clone(avf2, avf->streams[i]); if (!st) return AVERROR(ENOMEM); - - ret = ff_stream_encode_params_copy(st, avf->streams[i]); - if (ret < 0) - return ret; } return 0; diff --git a/libavformat/internal.h b/libavformat/internal.h index b6b8fbf56f..9b07cfb271 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -625,6 +625,17 @@ enum AVCodecID ff_get_pcm_codec_id(int bps, int flt, int be, int sflags); */ int ff_stream_side_data_copy(AVStream *dst, const AVStream *src); +/** + * Create a new stream and copy to it all parameters from a source stream, with + * the exception of the index field, which is set when the new stream is + * created. + * + * @param dst_ctx pointer to the context in which the new stream is created + * @param src pointer to source AVStream + * @return pointer to the new stream or NULL on error + */ +AVStream *ff_stream_clone(AVFormatContext *dst_ctx, const AVStream *src); + /** * Wrap ffurl_move() and log if error happens. * diff --git a/libavformat/mux.h b/libavformat/mux.h index c01da82194..1bfcaf795f 100644 --- a/libavformat/mux.h +++ b/libavformat/mux.h @@ -113,15 +113,6 @@ int ff_format_shift_data(AVFormatContext *s, int64_t read_start, int shift_size) */ int ff_format_output_open(AVFormatContext *s, const char *url, AVDictionary **options); -/** - * Copy encoding parameters from source to destination stream - * - * @param dst pointer to destination AVStream - * @param src pointer to source AVStream - * @return >=0 on success, AVERROR code on error - */ -int ff_stream_encode_params_copy(AVStream *dst, const AVStream *src); - /** * Parse creation_time in AVFormatContext metadata if exists and warn if the * parsing fails. diff --git a/libavformat/mux_utils.c b/libavformat/mux_utils.c index eb8ea3d560..2fa2ab5b0f 100644 --- a/libavformat/mux_utils.c +++ b/libavformat/mux_utils.c @@ -121,34 +121,6 @@ int ff_format_output_open(AVFormatContext *s, const char *url, AVDictionary **op return 0; } -int ff_stream_encode_params_copy(AVStream *dst, const AVStream *src) -{ - int ret; - - dst->id = src->id; - dst->time_base = src->time_base; - dst->nb_frames = src->nb_frames; - dst->disposition = src->disposition; - dst->sample_aspect_ratio = src->sample_aspect_ratio; - dst->avg_frame_rate = src->avg_frame_rate; - dst->r_frame_rate = src->r_frame_rate; - - av_dict_free(&dst->metadata); - ret = av_dict_copy(&dst->metadata, src->metadata, 0); - if (ret < 0) - return ret; - - ret = avcodec_parameters_copy(dst->codecpar, src->codecpar); - if (ret < 0) - return ret; - - ret = ff_stream_side_data_copy(dst, src); - if (ret < 0) - return ret; - - return 0; -} - int ff_parse_creation_time_metadata(AVFormatContext *s, int64_t *timestamp, int return_seconds) { AVDictionaryEntry *entry; diff --git a/libavformat/segment.c b/libavformat/segment.c index fa435d9f32..c904e20708 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -167,11 +167,9 @@ static int segment_mux_init(AVFormatContext *s) AVStream *st, *ist = s->streams[i]; AVCodecParameters *ipar = ist->codecpar, *opar; - if (!(st = avformat_new_stream(oc, NULL))) + st = ff_stream_clone(oc, ist); + if (!st) return AVERROR(ENOMEM); - ret = ff_stream_encode_params_copy(st, ist); - if (ret < 0) - return ret; opar = st->codecpar; if (!oc->oformat->codec_tag || av_codec_get_id (oc->oformat->codec_tag, ipar->codec_tag) == opar->codec_id || diff --git a/libavformat/tee.c b/libavformat/tee.c index f1f2a9d2a5..dd408dd096 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -284,14 +284,11 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave) } tee_slave->stream_map[i] = stream_count++; - if (!(st2 = avformat_new_stream(avf2, NULL))) { + st2 = ff_stream_clone(avf2, st); + if (!st2) { ret = AVERROR(ENOMEM); goto end; } - - ret = ff_stream_encode_params_copy(st2, st); - if (ret < 0) - goto end; } ret = ff_format_output_open(avf2, filename, &options); diff --git a/libavformat/webm_chunk.c b/libavformat/webm_chunk.c index d69db3a004..9e71a1209d 100644 --- a/libavformat/webm_chunk.c +++ b/libavformat/webm_chunk.c @@ -91,12 +91,10 @@ static int webm_chunk_init(AVFormatContext *s) if ((ret = av_dict_copy(&oc->metadata, s->metadata, 0)) < 0) return ret; - if (!(st = avformat_new_stream(oc, NULL))) + st = ff_stream_clone(oc, ost); + if (!st) return AVERROR(ENOMEM); - if ((ret = ff_stream_encode_params_copy(st, ost)) < 0) - return ret; - if (wc->http_method) if ((ret = av_dict_set(&dict, "method", wc->http_method, 0)) < 0) return ret; From patchwork Sat Aug 6 23:35:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Anthony Lemieux X-Patchwork-Id: 37167 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a9:b0:8d:7f3b:94fc with SMTP id q41csp1016487pzg; Sat, 6 Aug 2022 16:36:07 -0700 (PDT) X-Google-Smtp-Source: AA6agR4/nWeHI5a/vTuetB/oRHAPSpuYZ3fgPKnx2tGz/FjdKL7jBJWNIdBacvt8GjOpDh/pcEGO X-Received: by 2002:a05:6402:b84:b0:43d:962d:7db1 with SMTP id cf4-20020a0564020b8400b0043d962d7db1mr11840294edb.270.1659828967746; Sat, 06 Aug 2022 16:36:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659828967; cv=none; d=google.com; s=arc-20160816; b=WoS+p7ntooHAZj0LqtnD3sZVbgb9HiINu1Hm+51lYCr4MNxNsXGsvJo661hX2tNSOd JMs9bTJF1b5PBFI4G8IJx4MMt1AZRh77l3hK6joUL01NkHjljMsS5zxLuIjrAfwCQqi/ qvKp4nS9YJVxDLeMq3n2AdWhoRHWaZZ7WkCoWX5akhDy+mbsIpRgQEZEFq4vDY1GfRxn q1Mdh+4vBBOnxQMquCK/1tGpCP3mvc8tocvhq9+r1BnWqOzDg/0Ms/pQBPOOsNi2Ucpm rAOvHH64lppXXJT33UBlMxpLgxqvgn3/vELaXY1DLVAUFVSzcgzZU48zSjLhSAUucajA nKxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:delivered-to; bh=EXoARz3OyMRxDqZzOa9UkS9XVD8W3/4w9lH4PYU7LK8=; b=gqWf5WkyJPn4MCfZAnFS75nTXeKP7XYlmIjUn81Z866ijO+HSySY0lwGsgyytZ7ieU aSxdeY6YwPDkQ8bi+b0vmGn4A+rr3+uaQ4BvJd1FempvQkSTF/VjpypcyL5Xdq6M9n6D Cc8CQKfDCUUXpADYZdAZngv+Kwiw2y+KU6A9errHTfnre9RDDb8qVWvhAlIas6u/RpT4 +oSTt3937u4tBbGarCTWsS+yyopViVfpp9oh5bXJd0ugoQc4ZuETlUgUSi0AFIEkrVIZ BjOS/MGAZq4YnwyYhOvj1sprQCrjTpNoEttx3f9VYqaY+6Yc4Bxd+E4TB5N4I39mATnw Y4Xw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c10-20020a50f60a000000b0043d556dd041si2805708edn.446.2022.08.06.16.36.07; Sat, 06 Aug 2022 16:36:07 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8499F68B710; Sun, 7 Aug 2022 02:35:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5223B68B6F9 for ; Sun, 7 Aug 2022 02:35:51 +0300 (EEST) Received: by mail-pl1-f170.google.com with SMTP id o3so5641288ple.5 for ; Sat, 06 Aug 2022 16:35:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gq6jei1+J599H3II8rkEZ0Id8tdW9lHrn5Hpa2S3bRI=; b=sCDqAbja44v699NdAOVmRq58mhhqXRDw0JrSkKKc/+nXzfX86wr7Zzt+W/grrwziRj kSoFHY5chO7hQu8/+PdmFjwD6BgaNP1pKPlMlA/PSllkddK4yB1Gt/lfaVq6CkwZUK5V T1puH/2mMoGtGRRDUFtEF0NxbPI9VZ3eF4OrcNyBGDsqqtSepg5fUl/1nl7+MmLvqr6N hK1LgSOcMch/P5JvVDpjkjqwKQuP/bmvCU7R3w5Nzq2fYwH3WuL1S0iFXYcRPU9cS7Cu iroV8V9DmafQOi8wirjMLOhHyFwhqieDyUA6OzEO2XRCAzAH8Ai/CCUPVB1GYxH4rJ54 2SNA== X-Gm-Message-State: ACgBeo3Gc4uc90hrUqOf6e8i8DskdXaWtvWFu/pMV01ZWSOXJouMrSOp +gTm/buzKL+uP9SeCCJYbI2E0kKRkkY= X-Received: by 2002:a17:902:6b0b:b0:16c:e69c:bb11 with SMTP id o11-20020a1709026b0b00b0016ce69cbb11mr12622705plk.147.1659828949119; Sat, 06 Aug 2022 16:35:49 -0700 (PDT) Received: from localhost (76-14-89-2.sf-cable.astound.net. [76.14.89.2]) by smtp.gmail.com with ESMTPSA id w18-20020a170902e89200b0016dcbdf9492sm5627856plg.92.2022.08.06.16.35.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Aug 2022 16:35:48 -0700 (PDT) Received: by localhost (sSMTP sendmail emulation); Sat, 06 Aug 2022 16:35:26 -0700 From: pal@sandflow.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 6 Aug 2022 16:35:20 -0700 Message-Id: <20220806233520.1154-2-pal@sandflow.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220806233520.1154-1-pal@sandflow.com> References: <20220806233520.1154-1-pal@sandflow.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 2/2] avformat/imfdec: preserve stream information X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Pierre-Anthony Lemieux Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +B47VwSVCF4x From: Pierre-Anthony Lemieux --- libavformat/imfdec.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c index 71dfb26958..5bbe7a53f8 100644 --- a/libavformat/imfdec.c +++ b/libavformat/imfdec.c @@ -573,18 +573,14 @@ static int set_context_streams_from_tracks(AVFormatContext *s) first_resource_stream = c->tracks[i]->resources[0].ctx->streams[0]; av_log(s, AV_LOG_DEBUG, "Open the first resource of track %d\n", c->tracks[i]->index); - /* Copy stream information */ - asset_stream = avformat_new_stream(s, NULL); + asset_stream = ff_stream_clone(s, first_resource_stream); if (!asset_stream) { - av_log(s, AV_LOG_ERROR, "Could not create stream\n"); + av_log(s, AV_LOG_ERROR, "Could not clone stream\n"); return AVERROR(ENOMEM); } + asset_stream->id = i; - ret = avcodec_parameters_copy(asset_stream->codecpar, first_resource_stream->codecpar); - if (ret < 0) { - av_log(s, AV_LOG_ERROR, "Could not copy stream parameters\n"); - return ret; - } + asset_stream->nb_frames = 0; avpriv_set_pts_info(asset_stream, first_resource_stream->pts_wrap_bits, first_resource_stream->time_base.num,