From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id C6F17404BD for ; Mon, 24 Jan 2022 16:52:48 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 15D6A68B0C9; Mon, 24 Jan 2022 18:52:46 +0200 (EET) Received: from mail-ot1-f53.google.com (mail-ot1-f53.google.com [209.85.210.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A4A2368AFD1 for ; Mon, 24 Jan 2022 18:52:39 +0200 (EET) Received: by mail-ot1-f53.google.com with SMTP id v8-20020a9d6048000000b005960952c694so23002024otj.12 for ; Mon, 24 Jan 2022 08:52:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=eOIloVZc34gDlBUV12hFeBK7PvusKmr89Idhz8OYkoY=; b=I6CVCF0cJ/14CNjxHKWlEg1Sw9yNB77ksvLOT9ZABVJ08LSxvqQXdjLQq7ZZifGCxZ UTTcSmnl1FqTFA1Ej8l4UJquUb88uJzTuJEQnksSAEIz7P1DKAeYSEiYF6tbUM9PBoYm JhEu4EGP8F2nifNH66y87QjvZr7158Bsa4SISubA/g86kAfVYVCfOVe1ysMS5aRJGmvK 7WaUiRjwudmD/SrqvLj5tpbnxBhRooUgPZQ5+3WfY+RKAe5luvBA/PUVan9e5NcNCCZj 0etjuPOY5MqLoKZ7LmAlHHhVgQ3J5fudhzZ2WhOVQrhFcL1WS7pvzYPy0d8lz0Tb/J3Y tZBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=eOIloVZc34gDlBUV12hFeBK7PvusKmr89Idhz8OYkoY=; b=L7udDnd8uh3adLNtGzLqjAWmOJOakGZVDe1jubBZcpvl/ZEVXmyxgLaZQsnamk7OzO E/cqFlAocFz0+b/Ai6zlpYmX2wFZF4NA/TSHZahfuRY7In01SrhxJh74q0hg+P/iT0QR NNtZrjCg3z3LhaP6oU0MRYFh0Eyp4dWaLacW8Za3LdPXn12CUC0VDxwcfDt1LAqe2jYR 0DkBWavRzx717RAfnMT904b4xvInaUeKtiR7LVGwqADh0ctbzyVmnBwi3b9JtIKEl9uo RobV8fzbkWoQY1qZbFd6JF1c0m0xqnN1OXrqBsn4DYb5wSVXX0ccyP9ex/lhWzv8reCj cx/A== X-Gm-Message-State: AOAM533XdY+3yIGf0FbSBqHdWUbTzkliBycjNKylTxFN15ZHAOaNiBkI WgPA6FD9nfqXOdvi3M+7xUVCdIes/kY= X-Google-Smtp-Source: ABdhPJzH0Ej5rxlyNyE0j1PgT7RWrR20Xv2paCoklsiUiqnkvC/OLTfre9S4cS48MaDzKyeb/Loleg== X-Received: by 2002:a05:6830:16d0:: with SMTP id l16mr8635434otr.336.1643043157847; Mon, 24 Jan 2022 08:52:37 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id n22sm4512818ooq.27.2022.01.24.08.52.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 08:52:37 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 13:51:57 -0300 Message-Id: <20220124165157.6016-1-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/h264_parser: don't alter decoder private data 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: James Almer --- libavcodec/h264_parser.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index bb84cea821..cfbf6f4486 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -247,7 +247,6 @@ static inline int parse_nal_units(AVCodecParserContext *s, const uint8_t * const buf, int buf_size) { H264ParseContext *p = s->priv_data; - H264Context *h = avctx->priv_data; H2645RBSP rbsp = { NULL }; H2645NAL nal = { NULL }; int buf_index, next_avc; @@ -553,11 +552,9 @@ static inline int parse_nal_units(AVCodecParserContext *s, p->last_picture_structure = s->picture_structure; p->last_frame_num = p->poc.frame_num; } - if (h && sps->timing_info_present_flag) { + if (sps->timing_info_present_flag) { int64_t den = sps->time_scale; - if (p->sei.unregistered.x264_build >= 0) - h->x264_build = p->sei.unregistered.x264_build; - if (h->x264_build < 44U) + if (p->sei.unregistered.x264_build < 44U) den *= 2; av_reduce(&avctx->framerate.den, &avctx->framerate.num, sps->num_units_in_tick * avctx->ticks_per_frame, den, 1 << 30); -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".