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 005E2489A9 for ; Fri, 22 Mar 2024 20:30:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9850268D5D2; Fri, 22 Mar 2024 22:29:10 +0200 (EET) Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AD4A068D1FE for ; Fri, 22 Mar 2024 22:29:01 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=q4zg+p9u; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 8ADA04D61 for ; Fri, 22 Mar 2024 21:28:56 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id RyONO4xI1IgS for ; Fri, 22 Mar 2024 21:28:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1711139334; bh=v/tt7KaoieX5YgwZoDkdYJJ/pDysB0YcTpN8XtrA3DY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=q4zg+p9uA6Y9yvH3aG1gmOqjjE7EbDAarptEm4g7AoMwFMpouFJMNzpSSxPD9rw/0 fJJvKcIiXolvIbudJWBL3ytYl7WTX8DIXB8J4NXQIuTa9bmvA4KvsYS5BV1sau6ifr QfR06Nlwz05ux3xFa8j5KRM6E1ekgcwAnf8xcUUv1oJWumOF/sV+pDRJUVJ5r4fFmr sW9iMmKyXrFD5yv60bZ+YqrPkesWYhA18ENsMwCtEV9t6t2ReFg+PtsOI3yUY7X6ay snxuKCL1MwCKK9OFV0tYrtGb3R1/dKOvfl9G7T1Ty1OO0H2UH2o5Jzq1zKpJvugu5k hkTf6LNgd3Iag== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 880CE4D69 for ; Fri, 22 Mar 2024 21:28:54 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id A99753A1050 for ; Fri, 22 Mar 2024 21:28:45 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 22 Mar 2024 21:28:41 +0100 Message-ID: <20240322202841.31730-12-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240322202841.31730-1-anton@khirnov.net> References: <20240322202841.31730-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 12/12] fftools/ffmpeg_demux: make InputStream.autorotate private 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: It is no longer accessed outside of ffmpeg_demux. --- fftools/ffmpeg.h | 2 -- fftools/ffmpeg_demux.c | 8 +++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 1437b36b0d..84475434f3 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -370,8 +370,6 @@ typedef struct InputStream { int top_field_first; #endif - int autorotate; - int fix_sub_duration; /* decoded data from this stream goes into all those filters diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index af4b4cfd1e..d815dd3696 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -64,6 +64,8 @@ typedef struct DemuxStream { int streamcopy_needed; int have_sub2video; int reinit_filters; + int autorotate; + int wrap_correction_done; int saw_first_ts; @@ -1055,7 +1057,7 @@ int ist_filter_add(InputStream *ist, InputFilter *ifilter, int is_simple, if (!opts->name) return AVERROR(ENOMEM); - opts->flags |= IFILTER_FLAG_AUTOROTATE * !!(ist->autorotate) | + opts->flags |= IFILTER_FLAG_AUTOROTATE * !!(ds->autorotate) | IFILTER_FLAG_REINIT * !!(ds->reinit_filters); return ds->sch_idx_dec; @@ -1235,8 +1237,8 @@ static int ist_add(const OptionsContext *o, Demuxer *d, AVStream *st) ds->ts_scale = 1.0; MATCH_PER_STREAM_OPT(ts_scale, dbl, ds->ts_scale, ic, st); - ist->autorotate = 1; - MATCH_PER_STREAM_OPT(autorotate, i, ist->autorotate, ic, st); + ds->autorotate = 1; + MATCH_PER_STREAM_OPT(autorotate, i, ds->autorotate, ic, st); MATCH_PER_STREAM_OPT(codec_tags, str, codec_tag, ic, st); if (codec_tag) { -- 2.43.0 _______________________________________________ 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".