From patchwork Sat Mar 23 02:06:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47352 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1014:b0:1a3:ac71:9534 with SMTP id nk20csp285802pzb; Fri, 22 Mar 2024 19:07:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVMNuKIC+a/fzHTBe5nMTguaYFk/NkVvciHtuuK4MUOSgDkOjecejDo4zovp4g4Ll16S+QocdivYYGl8V7UY1k0dyVHFinmHcOkHQ== X-Google-Smtp-Source: AGHT+IF3/0aNOGB3yGzh6ZWKpqZCGGAz5Wb+8D9PeWN/MLAzIxuw/YqgLpG3p58Buk/UzJQvYiKN X-Received: by 2002:ac2:538c:0:b0:513:93dd:9ecd with SMTP id g12-20020ac2538c000000b0051393dd9ecdmr693469lfh.21.1711159621310; Fri, 22 Mar 2024 19:07:01 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w11-20020a170906d20b00b00a47358ae7e3si402802ejz.992.2024.03.22.19.07.00; Fri, 22 Mar 2024 19:07:01 -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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=g9Hq+7fe; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6050568D5B6; Sat, 23 Mar 2024 04:06:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2050.outbound.protection.outlook.com [40.92.74.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2355168D5B1 for ; Sat, 23 Mar 2024 04:06:43 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xmlst7ZWNQ/ejJpwCFgeIdyKk4uqWGiJVTZFzVEVlp/witR80JzrvghagdaMFBzmW6zRAYW/lkzEhl+Lj9pSrMQjfwQkHW/rgIBTqV/OUo2EStJjABUYCP+E2N9dv1C1q3l86yEOx4Lym20IvzqeuD9Sm4CCLyLJ0ZPmKyVq2KH5KL9OMG+jwtyW0ba2TMLTe4Usxx4Cm0hEcvHr28xA2WPS140jJBa2BBfoeqfgvWPqyBVugJ6frF5QlF4v1nid1ch5iPeS9lMlLjVreNAMxOiwedGEgGxULFK/hglktW9C3NVW79YB/OYIIc0asxDyxQThxMRKaDrcKIyslAMv6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Pduxyj4NVJ/uaEKkmH7RFm8P/De0C1gy6fOGYAIUgsE=; b=IciZktVjBvmMihPN0ZHK/nFebCj+EjKLQHSAJXEck0A6w3ehpFLlbdFRf475xLUMzwZ6mgpdxvq8gMSlq1NFbhlxlhgXNvHXagjdK6uFg9NUobrn5lZUtBxfB44fdS7mn8Lx7coKD4cllHGgq5nT8kOHtapyoIvLVZVT4Il41INeZFD13uXkKn5DIx6lhsJl2ibjT+kXRyltcJS4cO61gJgBz2QvVlHYBqHEgHsEv2TLlmoTiKge1Xhg0sRQBScqZ5EhU4KbP8FNvkHrDpSA8EsSWDFOzi8UXYI/gvWnF1KmCCMsGUi8iUlYHE+uMCXkjYVPklRk7pJnIoHujuDqcw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Pduxyj4NVJ/uaEKkmH7RFm8P/De0C1gy6fOGYAIUgsE=; b=g9Hq+7fez1mxDsX93yz6jmrsxDixTFzMw4iQJRXF3CUIyYUgDKV/yx9vhV9vtjm4aKI0bRPNMHXbvNRvLbAoVhenRpw4hE0bEP6WV8WHi4h04SFaYY+G6Yp96PKleP9C8kgEDUV4D35WM4VFm+vQubnmJmfBJI07gWe1BaTCWvl2xq8PvhwabCNEUrccX8CdIsjgFZpe27Mg1tlYkL6a7jqMXqn0JbTMB2AtkrYPgTjs1y4++smajltv8WKmgKukUPR2uJ6NthRclIUtP+LLmJXidf9/53oGM7wppVpHvzYYrRNAuZT3VFXjSS3VqaFMgZr8x+uk+yxfF/4KbTd81Q== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0137.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:320::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.24; Sat, 23 Mar 2024 02:06:34 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7386.025; Sat, 23 Mar 2024 02:06:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Mar 2024 03:06:12 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [9s4wMYxY6b8K7SgQdvvNqIbdmh7pLvGJUDFqo3ZmVGc=] X-ClientProxiedBy: ZR0P278CA0005.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::15) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240323020623.1570961-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0137:EE_ X-MS-Office365-Filtering-Correlation-Id: cc16af4e-0603-437e-9aca-08dc4adddd26 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqkjmXb1vlddM5aSa/Epk3A+VhfcnrVACgs6QaDndxlgvqtQ2kV56KANKnH/mGFAxfMLYRPDj97kFmDwNbBc0AIb9Ma75TSigVF8OV6ydxvT14Qs2a2uo4SV+xJWY1/85Pp9AfdJ6Sn8gnkcOCs/v7JrJftwkVZz/vxzqQXrVh9e9iOQxWytLLWHzWVmWBFgeoe/XUN+83HUPOfGSPOCuKlRL6cbdd53CV8zClAFfF5jAHTD+ma7Hh3BxMsUnaVRi5NSCfLkJaxrAabuXhVvoJwBaBeuq7Y2fPXNgzyrhflGeJteu9TcFxpDAkYC2ATIcTXXDkkwvK+wnCny1GW8lf10mTixA7W2dliaH12LzkrMzlf1NQXJJ5bDpXM5ETxcocojIlnxUG7oPsCs75RG/ubhRSNMIhZUfkbOjwv/LhMng6NZifLUU3Cu3Jhk/h1qzn6t8LQjRm4egiqOwpXKkRK5PKKI8DajJLPezjhBI+CVIgTsSz7a534QaPdM8T11Z6Oh1FxitJPw9NcEU1dK8aYSQHmmyiDgCeHl/uayTfb7mEL7uAaIpbonmjHbzJFaDjTEzsJ599XJ7MFqwsjYHHWA2hF8JtoZyXJNwyhENVYBKAlTpPgmSOEi5S4LQSs+44G52kckcITovZ9+xDtUn5ptqpSSpRr2AVgDX6cVla5z3iVEuhcMNdGp71LWapNIS+at2GpQKnXyAIG6wlNIdI+RaQVinAxYVLA1UHPkPka618zF7TJrJPXCE1Qh4Fo6tw= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +foKMya14VtJljupeE3eb6btwSCmLuIpfajLMNJUCbjztiuhdzkWO19cJkqhcmgEI4f8RSalFXJ5BnG3rYBjwBN+dxif0J+IeZ9pJmUBr4KKpbLpv4s/SsJUpKzRUgiWLRYudWodVA5o+X8mBt1ZyVj8JJufz2SwIDsEl09zPK1TMY2dD18cX1kAMLfe6p+Aw8HyaABL/eQiodeL72WkiyUuLUZzMiLIR7lPY9QHMs7Z3t7/UikCQhfDxeLgcioIE+jGjzXVyQo3KsfhPicFR7kaIuTGx4OId2vWchy7l39xcsB9yxUopDfu4ZNsxFKoKdacrZs6ufxQUCbpALwKgG6Vk3IhBdnQrJT5WVrWOFO2hMn5YTHV+zz37fwLGCKLGHEyW8gD+HiN6o6WJqpBZmvlEYD11903BxZ2RzXASMOGdxI2d1OOkgOyBviMK7uRIlh/PS5cYyV3YqvFskGMHnZpZxIR527HZnuz7s81eleaC00b4Wyy0AD6KUe8YfYjnWZaUD4a38pDWsb7jUcrI+HpQPJwjaV1zAC08US8Ydo7LgfRB1YqjzCxynl7wMLUgOf2n6mV6vt/s4RO4AFCikCXJUD8Ksd2tbebHxdvr2NA1gNMqGrCpBiPJcdnjPUv X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6uooaz6/eMS4A9FLuooNzBiSOKuZSP8Q2ABPtGnfNTGnBG2jEIqaVkA4METkmDmxcTcnFE1kRtzeCCKZ95B4Kgd+3AOsEiYya+i9W0mvfuLN5pR014kpnN/11IWklDDDlaiCwxuame5EjMFGNir9vwoSDZdRq41yH+xa/5/zFaaq6VoTywDtlD4ACGvFaaZNGuPbo0xKX4EqXRl5RYwLns01y5TIZhc+uMRY9C2FhFyRvcntXDXI/ZkaG4EAVDxs2NPtFBGI4vQqSI2rI0ylTAsB0/LpJZ2BlDVQLJ6hp4yacOrnXq8kwozdlfmc0G29J87/ffsq4ME6MIk2uvpyRWG7EnIsPF1MyYpM7vvk1TeA23NMSTfb3qSxi+lnqfrPtJrNg7vMlUOZXaUaS5NRQ+ZYQBnY4fiq00UvVcBwNmxGmQWjhf6esb4/oj6y5m1KD2HK8GaVmNJLb/a6XW8m5fF57L3JMeHgJwbINetwOtCCg6L/UcsQzrplDsgAAT0KnI1Q3uEBsGFz3D8am8eGOE5hcY4Fk9+gmAuSxF569MlEiNl+KI39wzpAJLURSFW6qzd0fXwNDMunlcnTCwUQe9jNDMj97iIovju0nhQWCaEXRE4F54fzbNrVFpeJzFI7Iw+qYNJBt2olWKn1SKeKOs0QHYmn0jLpITc/sKJG+quiLL6WX6xnZrB5LM/46MQP+x7RHe0p+cswauTgQJF2tkSSN9k+19NwRfFGlWECsUHADi9NPCyKZ0nPv9cD4SM1rRx/RAPpkQpkXQkJurDj5ipLmhCoLEwsk65UajHThiGhVb1GbsrR4Ozh2o4iFPmrq90qGRTbcYbykCS+/kC12bu0RKn/PYIvCHSbcGuadgy/Q3IJNK8G/w/dGCO80mhCso6QEAgmNd9uhHSKNegFSyK6Lh6VquLUESn8g1RGEsmYIdlhUFFwifm/MD7yYGpgGMPvYutEiq17leLjuaU/6oSk5JUdZlCAfI61Q7dmh0Z+HIiWpe3H3j7suL7iXXNKAqsKa9DifaMWAembWgUm+zLJlD8lq085wqi4/tlUMAca3GlVS3TvqFMr5ius1X1IKxUFNkXv0qB7EZbFYl/PYNQ0HORuh+gZVATy4FWAUK6sl33lUJmDAW9Up0QZXlfV7oeU9OWGBHEJ0EdroNjTmmZSv3vowLPG/B0r2yGlElosG2osyb0/rMjT7A9DdgwyXXgwBpYnERitxkpMjgASbfNIIxCW104bv3YQ0ZifvKeEGnXa06N298GsdLnYf3NPMmIMkDZzAFhOkyRyykjGiA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cc16af4e-0603-437e-9aca-08dc4adddd26 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2024 02:06:34.1242 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P250MB0137 Subject: [FFmpeg-devel] [PATCH 04/15] avformat/g722: Inline constants 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DXZBnt2QEhJw Forgotten in 5f0e161dd61552ad70760bad35b869eaec7368ff. Signed-off-by: Andreas Rheinhardt --- libavformat/g722.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavformat/g722.c b/libavformat/g722.c index 15519d90b5..adb78e8db5 100644 --- a/libavformat/g722.c +++ b/libavformat/g722.c @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/avassert.h" #include "avformat.h" #include "demux.h" #include "internal.h" @@ -38,10 +37,7 @@ static int g722_read_header(AVFormatContext *s) st->codecpar->sample_rate = 16000; st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO; - st->codecpar->bits_per_coded_sample = - av_get_bits_per_sample(st->codecpar->codec_id); - - av_assert0(st->codecpar->bits_per_coded_sample > 0); + st->codecpar->bits_per_coded_sample = 4; avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); return 0;