From patchwork Tue Jan 24 00:13:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 40092 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp3586249pzj; Mon, 23 Jan 2023 16:13:47 -0800 (PST) X-Google-Smtp-Source: AMrXdXtZ5dPL3xXvYnob260hmzCjEEj6Y64P1JdA/uGxXAarslm8v+FbcdpX15t7p8AqVOA0BvMD X-Received: by 2002:a17:906:d787:b0:872:5c0a:5597 with SMTP id pj7-20020a170906d78700b008725c0a5597mr25932911ejb.70.1674519227391; Mon, 23 Jan 2023 16:13:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674519227; cv=none; d=google.com; s=arc-20160816; b=kdwJEwo6gW3EW2QpNf8LrDWSbgFF3hWYQRCAo2idIMwSd9RGBy0E8T4CcACz9+vjP9 3Fg43QY5JAp7KdFLJGA/0zGCICvxX5F6kiOOLwsypRIukoQlb8TpojPkKd5wZRcjFK0y CO9PzFhYOaamFRN9tZF80ZAZtvYcsYJhqwx8xkQnf4GjtOn2JL6wt/6mEpvY35w55dfe GI43qYVZsL5/bXd7eK7YE2Vzn8UX5ocY0Rhj/gD6fb+7VTiXV21C+crc+mf2J1FinS3j 6NigWorzZTCuhAhgipGUT7inRl+oBw7fDxlHK2wKUPYGaBViXvItkSlw20zKpPIR5J0X e54g== 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=bLUaFiqo8hdMOUatGzFIOn8jo6EfMg9UVNt6O9/0xnw=; b=JnjMsaqIdDhY7WLRJtJu0NdlqtEwXIZFfnZF1ifayVp0GuBYE5n0jwRpe+UhnBQHb4 6KUTV/+r4z1ZXBcBKFZ7+FQHgoecskngKVfJ5xs+5BWSF4l3Gy2nnhL8GZGP7KB+Uo38 42nRwzAPHzv2X047ZonRGC3ReBsF7aWt/CHmplWF2IFHE3ozEcCvic4WQcqsWEDXt2bz /MaK1+reEtAH24XVauT9unRnzzAbjR+fk9he7kLE+U6w9Ddvpuw9p0P52wY6xQuu6o9F 4uxp/rIDwJ2NECShrQ/TGhJunuvmgYumRTs6j3HoeqI/dgZVnBEDNEkN/oyAhY7n8kmu B4kA== 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 v20-20020a17090610d400b007c16107b16bsi378473ejv.432.2023.01.23.16.13.46; Mon, 23 Jan 2023 16:13:47 -0800 (PST) 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 0D34768BDE7; Tue, 24 Jan 2023 02:13:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9E9E668BDDD for ; Tue, 24 Jan 2023 02:13:37 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 281ABE8633; Tue, 24 Jan 2023 01:13:36 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9c_c3ap2GH8k; Tue, 24 Jan 2023 01:13:29 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 5EB01E8630; Tue, 24 Jan 2023 01:13:29 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Jan 2023 01:13:18 +0100 Message-Id: <20230124001322.23263-1-cus@passwd.hu> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/mpeg4videoenc: use MpegEncContext->picture_number instead of encode function parameter 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: Marton Balint Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wTY3Yjzu0hTE They should be the same and that is what most encode functions use. Signed-off-by: Marton Balint --- libavcodec/mpeg4videoenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index a2a14afbd0..e327334d59 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -1065,7 +1065,7 @@ int ff_mpeg4_encode_picture_header(MpegEncContext *s, int picture_number) if (!(s->avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER)) { if (s->avctx->strict_std_compliance < FF_COMPLIANCE_VERY_STRICT) // HACK, the reference sw is buggy mpeg4_encode_visual_object_header(s); - if (s->avctx->strict_std_compliance < FF_COMPLIANCE_VERY_STRICT || picture_number == 0) // HACK, the reference sw is buggy + if (s->avctx->strict_std_compliance < FF_COMPLIANCE_VERY_STRICT || s->picture_number == 0) // HACK, the reference sw is buggy mpeg4_encode_vol_header(s, 0, 0); } if (!(s->workaround_bugs & FF_BUG_MS)) From patchwork Tue Jan 24 00:13:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 40093 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp3586331pzj; Mon, 23 Jan 2023 16:13:56 -0800 (PST) X-Google-Smtp-Source: AMrXdXtgdXecHp8PQlwannVisNtbjihwyrkvginq9/r8IBoJM90TJaeOpuk2w805DMtewrPJ/bba X-Received: by 2002:aa7:d7d5:0:b0:498:dec8:f41e with SMTP id e21-20020aa7d7d5000000b00498dec8f41emr28806192eds.3.1674519235889; Mon, 23 Jan 2023 16:13:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674519235; cv=none; d=google.com; s=arc-20160816; b=grZx2GI8jGeiM+EkNArFGHCTmA6UJseInjdG/GxdvlWXtIQQvpsz6Momc/gwjGeI0l s0YURh4Kqu82zuVqPHZIaspvIkK0hvPpppaUySg+rQ2NGYpsdY92liOIet7o+dS9WwtF fGj4MnkVWc1X355WxLEriccPIGFvwBbMGGokWBG3l9NnjbHH0uXBJ9GbC2Y5UYzcLPgk x9E/RRV0LH1eMB0mlLwDP4vrRfhy1QjLQAu0+H8btKy8QNUM+YzoWjaQp/zsniYuDmzH RcEOnglp89lyKqt3X4tbEN6Mhpu92LjzKD8/2QwQBDPg6yczXnjbFeZXdWjHVzpQVKp2 38LQ== 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=NKrKdEoJxTN9ifOEF/Jv7CBgHBcMuyv4RfA528K2KMo=; b=mLXyuB8gCYW/yB7lo/imv2rmxqFpTEv2CTQD98I/H1HGx+6SLJbZNUhpw7zNSsTFqX gcMbVzhYzXnb+LZtkXLwGH96+3UxM6rVgfIvlsdA29TQySkYNFEa0nO8KpsTc/fimdg8 CN8efyu7HK1BPKvVt2JjO0OrPid2HF1sN9c7kt9k7nHkLfkh9RRpwUOpk2gxKniCv2CR 7GG9Imvqua61+pwrLoOuTRiFqUwwAHw7BqC1mr8/b7VXB2XPJxXIN9q1kdi7Ph/0wKbJ lTfYorAM61oLQSJhy4Kp3LdeNEspbyDs/Yu+GInZg9UZGseRM90CLO1kEK/7YqTi95m5 fWHA== 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 t30-20020a056402241e00b00485fa68b06csi1103953eda.354.2023.01.23.16.13.55; Mon, 23 Jan 2023 16:13:55 -0800 (PST) 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 EF08D68BE09; Tue, 24 Jan 2023 02:13:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DCC3568BDE7 for ; Tue, 24 Jan 2023 02:13:38 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 72658E8636; Tue, 24 Jan 2023 01:13:37 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yiBGVZtqxB18; Tue, 24 Jan 2023 01:13:34 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 69820E8631; Tue, 24 Jan 2023 01:13:34 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Jan 2023 01:13:19 +0100 Message-Id: <20230124001322.23263-2-cus@passwd.hu> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230124001322.23263-1-cus@passwd.hu> References: <20230124001322.23263-1-cus@passwd.hu> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/rv20enc: use MpegEncContext->picture_number instead of encode function parameter 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: Marton Balint Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: lI6erYY2CKYI They should be the same and that is what most encode functions use. Signed-off-by: Marton Balint --- libavcodec/rv20enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/rv20enc.c b/libavcodec/rv20enc.c index a6bacacb48..00f6c41e77 100644 --- a/libavcodec/rv20enc.c +++ b/libavcodec/rv20enc.c @@ -39,7 +39,7 @@ void ff_rv20_encode_picture_header(MpegEncContext *s, int picture_number){ put_bits(&s->pb, 1, 0); /* unknown bit */ put_bits(&s->pb, 5, s->qscale); - put_sbits(&s->pb, 8, picture_number); //FIXME wrong, but correct is not known + put_sbits(&s->pb, 8, s->picture_number); //FIXME wrong, but correct is not known s->mb_x= s->mb_y= 0; ff_h263_encode_mba(s); From patchwork Tue Jan 24 00:13:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 40094 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp3586404pzj; Mon, 23 Jan 2023 16:14:04 -0800 (PST) X-Google-Smtp-Source: AK7set8b1yYa4YqmBlXr3PORfTpJwrEyEeicH1HL2McS6+u0pbxuT2cPIL07KEd22ZRKx0pQ86Rp X-Received: by 2002:a05:6402:b09:b0:49f:2100:2a2b with SMTP id bm9-20020a0564020b0900b0049f21002a2bmr1794603edb.31.1674519244665; Mon, 23 Jan 2023 16:14:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674519244; cv=none; d=google.com; s=arc-20160816; b=eSCkJLb9deNYDRU45jHsf5Pu3qE7aPP3RLQuwt49P98HGCBHwr7ITQ7+PXrwRSBnkc /+O6qpYGe/C5xE5YTfgLtE1v7pFQ1CLKWiCCSbma/GtJHtp0v3djxCZswT2iLwi4FxD+ +ve0jINyga4YlsNgnR0AmRxKJkcl1jwqiieUu2NTBo58HZCw0LpjM81vSmzpXDLLppc1 wXcXTK93iNZfUWcAP34bsInZCMvYggE+DxZlP5B2hgGXjJOwh+rFG3+iiUkce5wGyoKz lZzyfDNvpH2MBV5FbwcPs/OdHIHzyqAf2fkqx8ACja0ounQRgRcjnWUaSLe+RRUMrfxi sc3w== 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=2yFzjrf3xjooihiuRdY0BGDO+qRt6jt3zlEQSOdUxy4=; b=vCBT2uYEo7QfG1E4eRu7wbycrqvlwgYctRscKQqVqa7gvuVDtaiMhJiizPluapxViC Ml/Jy8CY3bJ1WuwxI+WwW+cOjQ23Q7Nwc9Zozv3d/iTwtC3CyT21mXwWWyegtR9OvpFF gvjnaFiyQAA5EtKUSX/qnFvfYRIit1I5o1c2Td0Vl3GBt08L1kyzdUFti0HrHRpHpnK6 ka0NXgTaA2eaoKcEvKDz0Opkb9PZdzaOHpQykNzFf6JD9d7/Smn0ET+7hj1so0TJ76LV XuqLxHoM9XSR9ubZC505UNBsJVw0Is+RMNaQvP8x4QNjjDyWV+4thfxOah91RLmatvAW rsdQ== 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 h6-20020aa7de06000000b0049e48d13300si914458edv.459.2023.01.23.16.14.04; Mon, 23 Jan 2023 16:14:04 -0800 (PST) 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 F25FA68BE10; Tue, 24 Jan 2023 02:13:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B4E3A68BE04 for ; Tue, 24 Jan 2023 02:13:41 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 4C37AE8632; Tue, 24 Jan 2023 01:13:40 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0AeE5nH8F9NC; Tue, 24 Jan 2023 01:13:37 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 8D233E8630; Tue, 24 Jan 2023 01:13:36 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Jan 2023 01:13:20 +0100 Message-Id: <20230124001322.23263-3-cus@passwd.hu> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230124001322.23263-1-cus@passwd.hu> References: <20230124001322.23263-1-cus@passwd.hu> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/mpegvideo: remove picture_number parameter from encode functions 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: Marton Balint Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: hEjEi0bwzLFU They are unused. Signed-off-by: Marton Balint --- libavcodec/flvenc.c | 2 +- libavcodec/flvenc.h | 2 +- libavcodec/h261enc.c | 2 +- libavcodec/h261enc.h | 2 +- libavcodec/h263enc.h | 2 +- libavcodec/ituh263enc.c | 2 +- libavcodec/mpeg12enc.c | 2 +- libavcodec/mpeg12enc.h | 2 +- libavcodec/mpeg4videoenc.c | 2 +- libavcodec/mpeg4videoenc.h | 2 +- libavcodec/mpegvideo_enc.c | 26 ++++++++++++-------------- libavcodec/msmpeg4enc.c | 2 +- libavcodec/msmpeg4enc.h | 2 +- libavcodec/rv10enc.c | 2 +- libavcodec/rv10enc.h | 4 ++-- libavcodec/rv20enc.c | 2 +- libavcodec/wmv2enc.c | 2 +- libavcodec/wmv2enc.h | 2 +- 18 files changed, 30 insertions(+), 32 deletions(-) diff --git a/libavcodec/flvenc.c b/libavcodec/flvenc.c index b49ca2e0d5..3329eb0d90 100644 --- a/libavcodec/flvenc.c +++ b/libavcodec/flvenc.c @@ -25,7 +25,7 @@ #include "mpegvideodata.h" #include "mpegvideoenc.h" -void ff_flv_encode_picture_header(MpegEncContext *s, int picture_number) +void ff_flv_encode_picture_header(MpegEncContext *s) { int format; diff --git a/libavcodec/flvenc.h b/libavcodec/flvenc.h index aaa0fcffab..1ecbb46b17 100644 --- a/libavcodec/flvenc.h +++ b/libavcodec/flvenc.h @@ -24,7 +24,7 @@ #include "mpegvideo.h" #include "put_bits.h" -void ff_flv_encode_picture_header(MpegEncContext *s, int picture_number); +void ff_flv_encode_picture_header(MpegEncContext *s); void ff_flv2_encode_ac_esc(PutBitContext *pb, int slevel, int level, int run, int last); diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c index e8ea357cbb..9d6c9a055f 100644 --- a/libavcodec/h261enc.c +++ b/libavcodec/h261enc.c @@ -52,7 +52,7 @@ typedef struct H261EncContext { } format; } H261EncContext; -void ff_h261_encode_picture_header(MpegEncContext *s, int picture_number) +void ff_h261_encode_picture_header(MpegEncContext *s) { H261EncContext *const h = (H261EncContext *)s; int temp_ref; diff --git a/libavcodec/h261enc.h b/libavcodec/h261enc.h index 102e994494..d8fdcad7aa 100644 --- a/libavcodec/h261enc.h +++ b/libavcodec/h261enc.h @@ -33,7 +33,7 @@ void ff_h261_reorder_mb_index(MpegEncContext *s); void ff_h261_encode_mb(MpegEncContext *s, int16_t block[6][64], int motion_x, int motion_y); -void ff_h261_encode_picture_header(MpegEncContext *s, int picture_number); +void ff_h261_encode_picture_header(MpegEncContext *s); int ff_h261_encode_init(MpegEncContext *s); #endif diff --git a/libavcodec/h263enc.h b/libavcodec/h263enc.h index fff85a18f2..e45475686e 100644 --- a/libavcodec/h263enc.h +++ b/libavcodec/h263enc.h @@ -25,7 +25,7 @@ #include "mpegvideoenc.h" void ff_h263_encode_init(MpegEncContext *s); -void ff_h263_encode_picture_header(MpegEncContext *s, int picture_number); +void ff_h263_encode_picture_header(MpegEncContext *s); void ff_h263_encode_gob_header(MpegEncContext * s, int mb_line); void ff_h263_encode_mb(MpegEncContext *s, int16_t block[6][64], diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c index 22e5a8368d..b52b9da52c 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -105,7 +105,7 @@ av_const int ff_h263_aspect_to_info(AVRational aspect){ return FF_ASPECT_EXTENDED; } -void ff_h263_encode_picture_header(MpegEncContext * s, int picture_number) +void ff_h263_encode_picture_header(MpegEncContext * s) { int format, coded_frame_rate, coded_frame_rate_base, i, temp_ref; int best_clock_code=1; diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 3ad1cd84a1..a6663a158b 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -468,7 +468,7 @@ void ff_mpeg1_encode_slice_header(MpegEncContext *s) put_bits(&s->pb, 1, 0); } -void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number) +void ff_mpeg1_encode_picture_header(MpegEncContext *s) { MPEG12EncContext *const mpeg12 = (MPEG12EncContext*)s; AVFrameSideData *side_data; diff --git a/libavcodec/mpeg12enc.h b/libavcodec/mpeg12enc.h index 0455e5e4e2..0b35af8a30 100644 --- a/libavcodec/mpeg12enc.h +++ b/libavcodec/mpeg12enc.h @@ -26,7 +26,7 @@ #include "mpegvideo.h" -void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number); +void ff_mpeg1_encode_picture_header(MpegEncContext *s); void ff_mpeg1_encode_mb(MpegEncContext *s, int16_t block[8][64], int motion_x, int motion_y); void ff_mpeg1_encode_init(MpegEncContext *s); diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index e327334d59..27df9ba098 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -1056,7 +1056,7 @@ static void mpeg4_encode_vol_header(MpegEncContext *s, } /* write MPEG-4 VOP header */ -int ff_mpeg4_encode_picture_header(MpegEncContext *s, int picture_number) +int ff_mpeg4_encode_picture_header(MpegEncContext *s) { uint64_t time_incr; int64_t time_div, time_mod; diff --git a/libavcodec/mpeg4videoenc.h b/libavcodec/mpeg4videoenc.h index 243cd297a2..f0d5c3d077 100644 --- a/libavcodec/mpeg4videoenc.h +++ b/libavcodec/mpeg4videoenc.h @@ -32,7 +32,7 @@ void ff_mpeg4_encode_mb(MpegEncContext *s, int16_t block[6][64], int motion_x, int motion_y); void ff_set_mpeg4_time(MpegEncContext *s); -int ff_mpeg4_encode_picture_header(MpegEncContext *s, int picture_number); +int ff_mpeg4_encode_picture_header(MpegEncContext *s); void ff_mpeg4_encode_video_packet_header(MpegEncContext *s); void ff_mpeg4_stuffing(PutBitContext *pbc); diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 9b11c5c05a..bb101612e5 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -83,7 +83,7 @@ #define QMAT_SHIFT_MMX 16 #define QMAT_SHIFT 21 -static int encode_picture(MpegEncContext *s, int picture_number); +static int encode_picture(MpegEncContext *s); static int dct_quantize_refine(MpegEncContext *s, int16_t *block, int16_t *weight, int16_t *orig, int n, int qscale); static int sse_mb(MpegEncContext *s); static void denoise_dct_c(MpegEncContext *s, int16_t *block); @@ -1795,7 +1795,7 @@ int ff_mpv_encode_picture(AVCodecContext *avctx, AVPacket *pkt, if (ret < 0) return ret; vbv_retry: - ret = encode_picture(s, s->picture_number); + ret = encode_picture(s); if (growing_buffer) { av_assert0(s->pb.buf == avctx->internal->byte_buffer); pkt->data = s->pb.buf; @@ -3556,14 +3556,12 @@ static void set_frame_distances(MpegEncContext * s){ } } -static int encode_picture(MpegEncContext *s, int picture_number) +static int encode_picture(MpegEncContext *s) { int i, ret; int bits; int context_count = s->slice_context_count; - s->picture_number = picture_number; - /* Reset the average MB variance */ s->me.mb_var_sum_temp = s->me.mc_mb_var_sum_temp = 0; @@ -3788,32 +3786,32 @@ static int encode_picture(MpegEncContext *s, int picture_number) break; case FMT_H261: if (CONFIG_H261_ENCODER) - ff_h261_encode_picture_header(s, picture_number); + ff_h261_encode_picture_header(s); break; case FMT_H263: if (CONFIG_WMV2_ENCODER && s->codec_id == AV_CODEC_ID_WMV2) - ff_wmv2_encode_picture_header(s, picture_number); + ff_wmv2_encode_picture_header(s); else if (CONFIG_MSMPEG4ENC && s->msmpeg4_version) - ff_msmpeg4_encode_picture_header(s, picture_number); + ff_msmpeg4_encode_picture_header(s); else if (CONFIG_MPEG4_ENCODER && s->h263_pred) { - ret = ff_mpeg4_encode_picture_header(s, picture_number); + ret = ff_mpeg4_encode_picture_header(s); if (ret < 0) return ret; } else if (CONFIG_RV10_ENCODER && s->codec_id == AV_CODEC_ID_RV10) { - ret = ff_rv10_encode_picture_header(s, picture_number); + ret = ff_rv10_encode_picture_header(s); if (ret < 0) return ret; } else if (CONFIG_RV20_ENCODER && s->codec_id == AV_CODEC_ID_RV20) - ff_rv20_encode_picture_header(s, picture_number); + ff_rv20_encode_picture_header(s); else if (CONFIG_FLV_ENCODER && s->codec_id == AV_CODEC_ID_FLV1) - ff_flv_encode_picture_header(s, picture_number); + ff_flv_encode_picture_header(s); else if (CONFIG_H263_ENCODER) - ff_h263_encode_picture_header(s, picture_number); + ff_h263_encode_picture_header(s); break; case FMT_MPEG1: if (CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER) - ff_mpeg1_encode_picture_header(s, picture_number); + ff_mpeg1_encode_picture_header(s); break; default: av_assert0(0); diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c index 9b6e5efa0c..8798b15152 100644 --- a/libavcodec/msmpeg4enc.c +++ b/libavcodec/msmpeg4enc.c @@ -216,7 +216,7 @@ static void find_best_tables(MSMPEG4EncContext *ms) } /* write MSMPEG4 compatible frame header */ -void ff_msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number) +void ff_msmpeg4_encode_picture_header(MpegEncContext * s) { MSMPEG4EncContext *const ms = (MSMPEG4EncContext*)s; diff --git a/libavcodec/msmpeg4enc.h b/libavcodec/msmpeg4enc.h index 602e60112d..da9a45b589 100644 --- a/libavcodec/msmpeg4enc.h +++ b/libavcodec/msmpeg4enc.h @@ -34,7 +34,7 @@ typedef struct MSMPEG4EncContext { } MSMPEG4EncContext; void ff_msmpeg4_encode_init(MpegEncContext *s); -void ff_msmpeg4_encode_picture_header(MpegEncContext *s, int picture_number); +void ff_msmpeg4_encode_picture_header(MpegEncContext *s); void ff_msmpeg4_encode_ext_header(MpegEncContext *s); void ff_msmpeg4_encode_mb(MpegEncContext *s, int16_t block[6][64], int motion_x, int motion_y); diff --git a/libavcodec/rv10enc.c b/libavcodec/rv10enc.c index d0704c5a4b..7f7477ad7b 100644 --- a/libavcodec/rv10enc.c +++ b/libavcodec/rv10enc.c @@ -31,7 +31,7 @@ #include "put_bits.h" #include "rv10enc.h" -int ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number) +int ff_rv10_encode_picture_header(MpegEncContext *s) { int full_frame= 0; diff --git a/libavcodec/rv10enc.h b/libavcodec/rv10enc.h index 66672f8087..fc3665e839 100644 --- a/libavcodec/rv10enc.h +++ b/libavcodec/rv10enc.h @@ -23,7 +23,7 @@ #include "mpegvideo.h" -int ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number); -void ff_rv20_encode_picture_header(MpegEncContext *s, int picture_number); +int ff_rv10_encode_picture_header(MpegEncContext *s); +void ff_rv20_encode_picture_header(MpegEncContext *s); #endif /* AVCODEC_RV10ENC_H */ diff --git a/libavcodec/rv20enc.c b/libavcodec/rv20enc.c index 00f6c41e77..b1b88819db 100644 --- a/libavcodec/rv20enc.c +++ b/libavcodec/rv20enc.c @@ -34,7 +34,7 @@ #include "put_bits.h" #include "rv10enc.h" -void ff_rv20_encode_picture_header(MpegEncContext *s, int picture_number){ +void ff_rv20_encode_picture_header(MpegEncContext *s) { put_bits(&s->pb, 2, s->pict_type); //I 0 vs. 1 ? put_bits(&s->pb, 1, 0); /* unknown bit */ put_bits(&s->pb, 5, s->qscale); diff --git a/libavcodec/wmv2enc.c b/libavcodec/wmv2enc.c index 05f993525d..cdc450060b 100644 --- a/libavcodec/wmv2enc.c +++ b/libavcodec/wmv2enc.c @@ -93,7 +93,7 @@ static av_cold int wmv2_encode_init(AVCodecContext *avctx) return 0; } -int ff_wmv2_encode_picture_header(MpegEncContext *s, int picture_number) +int ff_wmv2_encode_picture_header(MpegEncContext *s) { WMV2EncContext *const w = (WMV2EncContext *) s; diff --git a/libavcodec/wmv2enc.h b/libavcodec/wmv2enc.h index 3f7f5104a6..263265acf3 100644 --- a/libavcodec/wmv2enc.h +++ b/libavcodec/wmv2enc.h @@ -23,7 +23,7 @@ #include "mpegvideo.h" -int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number); +int ff_wmv2_encode_picture_header(MpegEncContext * s); void ff_wmv2_encode_mb(MpegEncContext * s, int16_t block[6][64], int motion_x, int motion_y); From patchwork Tue Jan 24 00:13:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 40095 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp3586467pzj; Mon, 23 Jan 2023 16:14:14 -0800 (PST) X-Google-Smtp-Source: AMrXdXvUa5YFWgiGLQEq2Kyh/2uKWn5zdBY+I7FPUEEQrmqvitd5n1uiuazdXyAxTBWGBc76pFwz X-Received: by 2002:a17:906:fb16:b0:7c1:6d65:4718 with SMTP id lz22-20020a170906fb1600b007c16d654718mr27498338ejb.33.1674519254152; Mon, 23 Jan 2023 16:14:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674519254; cv=none; d=google.com; s=arc-20160816; b=AxtmD6Rl8y5cLS7zYJNYM2tzSrg7XPY198yB+xPsBEnsT+Q+UhWcdIvoZdMZsvyrOE zqFDKLtnAG8D6IsxW+Rhuhve+ZGFsrz/vH8u0jj/6NmnxoXRKbvJ8/9nPBcmsaDWyFrO n8/MY1OxuCrFz3ypvrtZvgeba2johmLE28iflSZGSlLV3Sen/V2JZwCz0sa38SJsIvAO wa2aEfimmuGfdX7YDdRIoQ7fLVwqJZUarZYWWkE1XXbbsTrmP+MwDh4LUDPqLwnLZO38 AmrjgYM0gGXFv2DXV7+m4wzZwRZ7S8nrZIp9WA1Da9RASy8t/vhq+9PymAoftrNqEZ4e p/jA== 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=V6k/DrIrgt79XY+k5n09EoCPJMKzr6TuExQDlR4M+no=; b=ruo26nwFGv4QckLZ2Lk8vIzW4fi4Br50nO0ImuK+awePUzf2ayim9/k6xtkXoIlNaN syJVO5y2gQFBSpO0TqJS4uputUwhTUnfni+EpOE3GVH6ka4sElu2JTCWUpiS7LLHaPmu ROwq6uZkLWfumCaiMk/iASaYQ/cBOtPzKSyGMyfZIIQsl5Pd71LuVpGHbK6uz3M7Qy8I nIKQpps2vD+tLaB5MnRsDQXmp3NN4CN8PmU/XdN8GpughWisQQYn9W2jeRLtlcKj9tPP HOjeDoq1NhIodyB/3kTPKsy3UjpUTDElCWQzAoVpAoVwOxfQiLLfkBQkCjXhp4HYPKeT HqXg== 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 fv33-20020a17090750a100b007c101c9237asi308496ejc.668.2023.01.23.16.14.13; Mon, 23 Jan 2023 16:14:14 -0800 (PST) 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 26A0F68BE16; Tue, 24 Jan 2023 02:13:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4E73D68BE11 for ; Tue, 24 Jan 2023 02:13:43 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id DD028E8630; Tue, 24 Jan 2023 01:13:41 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id n1GvvKEISeVX; Tue, 24 Jan 2023 01:13:40 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 1D00CE8631; Tue, 24 Jan 2023 01:13:38 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Jan 2023 01:13:21 +0100 Message-Id: <20230124001322.23263-4-cus@passwd.hu> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230124001322.23263-1-cus@passwd.hu> References: <20230124001322.23263-1-cus@passwd.hu> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/ratecontrol: drop remnants of libxvid rate control 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: Marton Balint Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: zQUM9YYYV+5H --- libavcodec/ratecontrol.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/ratecontrol.h b/libavcodec/ratecontrol.h index 2a7aaec644..4de80fad90 100644 --- a/libavcodec/ratecontrol.h +++ b/libavcodec/ratecontrol.h @@ -80,9 +80,6 @@ typedef struct RateControlContext{ int frame_count[5]; int last_non_b_pict_type; - void *non_lavc_opaque; ///< context for non lavc rc code (for example xvid) - float dry_run_qscale; ///< for xvid rc - int last_picture_number; ///< for xvid rc AVExpr * rc_eq_eval; }RateControlContext; From patchwork Tue Jan 24 00:13:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 40096 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp3586523pzj; Mon, 23 Jan 2023 16:14:23 -0800 (PST) X-Google-Smtp-Source: AMrXdXtCmYluVkN4fqSjr0glatga8A1Lbmlg+Y8xek8ahDtqJGw3KXxc9rXNz6LnHdsRM1m5TRV+ X-Received: by 2002:a05:6402:104a:b0:499:bf28:d9c6 with SMTP id e10-20020a056402104a00b00499bf28d9c6mr29412930edu.5.1674519263602; Mon, 23 Jan 2023 16:14:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674519263; cv=none; d=google.com; s=arc-20160816; b=LyoJEuL7K2x2nDGDeAXojuGJb1VNoTnWlSm9raQbfMLtnQSxp2rnBS/3tEY4rXThh6 EmybvNqeos4OWfJj5wvQWDR6Vr3fVB1APoEGl2H1qFxWsehSQrAQ1O0Vvi+kXVtoRJO5 N0Oiro7vlOZG6/QX6rDUuaq0BXx5EE5YTYAY3ZAQnKTAWqBbuqe3387HK6B4/ohHS6km Tp81lKbRRIDhPmrZq79+/iTzvGVUqXQPZlppcVgTQdpitvbPpFb6QvxnTlMq3/jdQ+sl 2iP1PINmBvsLb01PF9H1rx/gHFt0O4DeQk7yuB6WiNlbdqj/Src34RuboWd6+F9jxWVv hZTg== 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=ddRGrm2LB/dv/b/1DEQo34gOmK3HZ2CgeuovuFeMEJ0=; b=HfyEvGr+Mno020LGcoRsHUcX7nGma9FIN4NG9b6TnVpiRdOC8n24GsjJM34T7U/e9a 4ZrMfY8AmTDfUCvxjiGwN6MYoXbtkaq627SmmVH5OGng3Xteev0W4k0ZHc+yuPz5UsGF bUD4cBTBZmmwk42/z02RRlSSUlud2EjaWcWUUdcDg+adtqRVcDG1sBAJ5XbYpL1UughF gZsGdZ6JAWQbK5KJhiMRA5uSxg6SerdwFKN+2m77Hqow0LT0HjRdCKkYUNvGRDDJ1f6V 1HmwRFojH4QF9KugaBykY+MzF5SacPTx68a76aaApJSFjg3fPF842h9pxZrAnxVzgUH7 gbOQ== 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 x3-20020aa7dac3000000b0045d4b7ad162si910772eds.546.2023.01.23.16.14.23; Mon, 23 Jan 2023 16:14:23 -0800 (PST) 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 1BE3868BE1C; Tue, 24 Jan 2023 02:13:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DD19768BE02 for ; Tue, 24 Jan 2023 02:13:44 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 7D14CE8631; Tue, 24 Jan 2023 01:13:43 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id n225qZKA3z9c; Tue, 24 Jan 2023 01:13:41 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id BF645E8639; Tue, 24 Jan 2023 01:13:39 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Jan 2023 01:13:22 +0100 Message-Id: <20230124001322.23263-5-cus@passwd.hu> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230124001322.23263-1-cus@passwd.hu> References: <20230124001322.23263-1-cus@passwd.hu> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/ffv1: use 64-bit frame counter 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: Marton Balint Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Popp+4Pmknqm Signed-off-by: Marton Balint --- libavcodec/ffv1.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h index 005f308784..04869da5c9 100644 --- a/libavcodec/ffv1.h +++ b/libavcodec/ffv1.h @@ -85,7 +85,7 @@ typedef struct FFV1Context { int chroma_h_shift, chroma_v_shift; int transparency; int flags; - int picture_number; + int64_t picture_number; int key_frame; ThreadFrame picture, last_picture; struct FFV1Context *fsrc;