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 0E97A43219 for ; Sat, 25 Jun 2022 04:43:46 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D4A8668B786; Sat, 25 Jun 2022 07:43:43 +0300 (EEST) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069102.outbound.protection.outlook.com [40.92.69.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 296BA68B784 for ; Sat, 25 Jun 2022 07:43:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LLF+mikSFubRJySqvS+fhz6rzxGSjf68KkShVUTHVZzDZN8DNNvVvHnX0Mo1eRrpcG3auT+0Gg9rKyuA5DdVSGX7Q2UTibz7LFpbyKFbNgAa59pMQN+LY0btI+MvGEsn2gtTFVsdyI+cGG9BrRh+UcZy9eAsuelgYBFjKMwWmvWlbi6UGtA8WR5dgymqWr8Tho6EAX/Ym8QVo76cRU+Am6o+dVs2VxVOmIpBu0tcw+tHk2PGsNW4nFvDI+w1qHuqIaGT93+Ggxw1vkqIab2ezjVrb1OC3aZtUsOrGOw5x3T9QA/u4jZ07KanD0OOVSb46qRJpWCHsy/UgziyBb/gcA== 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=ob9SMWJgtdi4ugDLRidcSHGCXcVRU6jv+pIZBcrIHfA=; b=ILo7EOgxw9JGXtnQBgDT5MBO18OzSnHf4AfLL4p+r3SXNRTazG64hGecvOpbQtL4bswkx0mY/3SuJg/WW7ZL0tHesA5vibep1p7wrphzP549TTQzvfjGjwW7L2NuqW5PoLCnDofK3r0Zd8+W0gOEzLYTz25qw9WPt+2RpT1cdKNlhQS1ryn99rMfrTjImpvh7mZTwZ8Q4r/v3z/PAVtN1RAKPtCQIk5KTGsef1t4uxCV6DDMvEIi0HfWBIknKK8oiTj5eMclJ5NGnqXcxIq1CVTy8lFWcWomuMklaY2FgZSipLkjNBCcFVpwPTwN4LSoD8/8vshttA2bFeH5Q8DYuA== 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=ob9SMWJgtdi4ugDLRidcSHGCXcVRU6jv+pIZBcrIHfA=; b=fL/qKiYc2pgVzQZ8pTVkeF+WQfHRMAfym7zlZuB1MC5Fgtav8OBkKralIn8+ulmTqEMJ6Kc6rDwKBKqA8WCRZaMb28mhRGpY/cU4jN8RG+7ulWu5+D4rdWdBveoWPH100Kt2qFog8SHi0poMtACh1KIxBYFTv3RL3/slwBz8JiFm1ChzvmmsSfAzpK1x/Zb6jOePr5IT4Kilkx/q6IPA2WJWQSEMfb5JKq/zNJ3rgLxOmqQ+qEqY3kyQseT1oEidu6cFrev/cHUSEO9DVZyBRbyvOy7iAb7TCET3oiVRu181vPyK+qbKlPV59zCX397P6T3y5AWh+6zmVoxskxKTJw== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by PA4PR01MB8922.eurprd01.prod.exchangelabs.com (2603:10a6:102:2a2::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.14; Sat, 25 Jun 2022 04:43:35 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5353.024; Sat, 25 Jun 2022 04:43:35 +0000 Message-ID: Date: Sat, 25 Jun 2022 06:43:32 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220623122636.24732-1-anton@khirnov.net> From: Andreas Rheinhardt In-Reply-To: <20220623122636.24732-1-anton@khirnov.net> X-TMN: [fshWYofgwdWAIa8it7680gt+VVaiSu6v] X-ClientProxiedBy: ZRAP278CA0002.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::12) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 324d1ea8-3498-4390-b6be-08da56654347 X-MS-TrafficTypeDiagnostic: PA4PR01MB8922:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: serzsA6eUYUudpODbPXPmYFlxj3H5z0MkMDO8JlW7WyajU60vmu6WV4VVrk00zinPdmisM9WBxgffO1CP6NwqbCPQGOsmxsc0AA4aR576zJ2ElLOI0YKMoa/JBO+l+RIYGlQq/9hj7eoEucRBgd+IpCqXwJS29UnCsdWY8EwkDYQqypNAQ1MSHbmQuvFhwJXS4qYcwgdWE+rcMiREopoQCD2p4VZS8mA6aKCgVPaN5Kdzex1zCz85pa2vpsgSDZr9s3ZAbjXNl/dPO52fR0if0YVY52EWRdaW3S9XmCIahUSqlZNFRckD7MStoVeqmvhSR63x9KZryp3Vj+/KDf7lvZ923CYZpHNgiEG6NtmyAP73v6DIMXPrgrh6M4KVEl2WkACYkzYhBNbG/wkBWLZsrMhupDXJYbqjJj+IvftkZswXF/ULJDnJme5CTwSv8nvhQXe5BBVbxHGYffT11iON1kiHHSYi2+xlUUAzACzJbkcWbdnVjwqHuyYszM0pbJxAg/zfSBxdXLzJ8wNljQM28Tf43cNOA5G44CQuap5Po6UTT0g0Frk9Mzwem2477sXBhf1FeiKKnCgQY2AYDpsaUQOe9pENOM2UGhKWW+4dudl8zpV3CZcRyQSxVMtwhJv X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TjJ3WjRCMVk4dHErU2JPTGlNY29XVTFweTVUeUZhYitOWVN1dlh5MlR5U0Q1?= =?utf-8?B?QnNHRGlUeFFvc3hUU0xBTVltZ0h3cldJM1hweXg0WVVidnhvVEQ2bktMQjJm?= =?utf-8?B?RVZVSU5rUmI5aWNCdTF6b2ttcmhZN1N4N1prQWNwY3lpUEdKUEh5RlBxdzBo?= =?utf-8?B?VFV4YlVJa0lhanVHUy9Ka2h2c3NZOElaR2VobDhwcmpVemZaZ1ZBcVlJbFlr?= =?utf-8?B?NER4YmRZOGFHL0tNQ3VqckRtNTZ4OEdvem5ZM2NFWWp1WG9lMDZ3dm1ZR2Ir?= =?utf-8?B?YXJ2bmJxcENPb3J3aDFBQm1rWlBCbmZuQ1NrdlF2Sy9ZZUU5RjlyM1lBdmVO?= =?utf-8?B?M2JieVRZRWhlTVhJdEhhMXBERk5SNWtWUVhYbTc5Kyt2S2NzVkRpL1NQU0tU?= =?utf-8?B?Y0hCWlNMM0ZjbkVwT2J0T3p5RFpPNTFKVEFaNDlvYkJOZkIrS1l0SnNBTVk5?= =?utf-8?B?dVNQWW1BSEF5bVl3NFpaTS9qZ0hZN3BDdFJJOHNiV1NQSVl2TW9NR3cwbWM1?= =?utf-8?B?RzNoS1Q4UWtTM0NtYXRQQUZJTWZJdDBrY2NnakdsR0hFRDJmZExwN3orV3Ns?= =?utf-8?B?bm9KbU9mQVpGNWFiY1ZNYmZPTWwxM0hvL3RtcXc4dk5GbWQ2cW85UnE0TURW?= =?utf-8?B?SEFQd3RDSWlaemIwZTgvdmFONmxtcFhuVTErVDZ5c3d4RHM5ZEZHNVJlOUpu?= =?utf-8?B?eElUalZaSHZxd0R1aDZxQzBKSDdpTjJQU2prNGdsRXNMajVyS3M1NGhxY2JC?= =?utf-8?B?U1IxeW5aNVNwL1dnMEdFSWMxaTVXQ1hnOVU1S1F2Vm9NdTdqUnA2amhYdUJL?= =?utf-8?B?WS90Ky9URE5RSEFwVUYwSFdMWktiTXUxeThCVzdCMkZ2VHlWNlRrRVNDSklq?= =?utf-8?B?WTFNd3RJbWh2OG9PZHlyUEY3ejQzV1hpWTFQOXA0a2c5Nzd6TVpCR2NKL3NJ?= =?utf-8?B?NXhPcSs4cnR2L0NBRzN0cURKRzN5SkJiR1JpcENld0ozNTJVanpqdFpSdHpG?= =?utf-8?B?dzdSOG8xUHVycVZzY0tWcy9QNllqYWtucHJhZjZlKytFK2xlNmJzbUdzT0Ex?= =?utf-8?B?bXN6VXY1bnJPbVZhMXpmNk5weWIwN01uZUg4RXpYNXJRSE9FZXZEWUhqRnhy?= =?utf-8?B?R0c2bXRpRWdueGk3ZG1xUHo1bGI2TWo0bzl5MXIrRzhsaEZLekxwdlRJV01q?= =?utf-8?B?NzgzZmNDL2h2ZGZaV1MzcGhaVjZqVzRCUTRacjFYcWlJS2xKYjVxbEdpOHEw?= =?utf-8?B?Mk94VEd5TUtjZnM1TmhmajVrcWtnR2ZpNjdva01zSHpQbVBwV0EzNmJLR2xw?= =?utf-8?B?U1pCMkdGazE4WUx3c1c3dGdVMEJ5NkpuTlhPY2dYWmE0SmlEUDR0UXNkYjZ2?= =?utf-8?B?dWI3SHpXaWRlS3RLVVNVTm1YMjg2SGk4N1ZLenViZG1naTRhU1VxSXp4Z2Ju?= =?utf-8?B?cTVHMFdxSlJpRndNNm5lYVJ6eVpJSVdPYTliZVk4MjBoOXY3R1Rsc21HSURM?= =?utf-8?B?bXJzZ3ZUWFBzOFcxWTdJVThScm1ydEZiN3paaGpCVHJYWGhQNldDTXo0cDBR?= =?utf-8?B?LzdObnVobWJsT2tkWFgxUGtOTW5sYSt6aDZzOGxkVDEwS2NBalNONERtRzVM?= =?utf-8?B?T2Z6SzlEUEtjVmFJRzlQdDhTelNHTWpZWFl6OW04Wk5RL1JLZGVMQXdhKy9L?= =?utf-8?B?Y0hqQUJVNnJDUFBJVEI0NkFJbHJCVHE3MlNIQXBiVzZoaWZZTUF6NVF4YUJv?= =?utf-8?Q?eJf08eun3RnZdV23nk=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 324d1ea8-3498-4390-b6be-08da56654347 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2022 04:43:35.0086 (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: PA4PR01MB8922 Subject: Re: [FFmpeg-devel] [PATCH 1/4] get_bits: move check_marker() to mpegvideodec.h 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: Anton Khirnov: > It is only used by mpegvideo-based decoders - specifically mpeg12, intelh263, > ituh263, mpeg4video. > --- > Resending the set rebased against current master (there conflicts with > 2d764069be3b4092dc986467660607d922023332) and with patch 04 skipped, as > Andreas pointed out issues with it. It is not needed by the other > patches, so can be left out for now. > > Apparently Paul has withrawn his objections and Lynne approved the > previous iteration on IRC, so will push this in a few days if nobody > objects. > --- > libavcodec/get_bits.h | 10 ---------- > libavcodec/intelh263dec.c | 1 + > libavcodec/ituh263dec.c | 1 + > libavcodec/mpegvideodec.h | 10 ++++++++++ > 4 files changed, 12 insertions(+), 10 deletions(-) > > diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h > index 16f8af5107..9f2b1784d5 100644 > --- a/libavcodec/get_bits.h > +++ b/libavcodec/get_bits.h > @@ -610,16 +610,6 @@ static inline unsigned int show_bits_long(GetBitContext *s, int n) > } > } > > -static inline int check_marker(void *logctx, GetBitContext *s, const char *msg) > -{ > - int bit = get_bits1(s); > - if (!bit) > - av_log(logctx, AV_LOG_INFO, "Marker bit missing at %d of %d %s\n", > - get_bits_count(s) - 1, s->size_in_bits, msg); > - > - return bit; > -} > - > static inline int init_get_bits_xe(GetBitContext *s, const uint8_t *buffer, > int bit_size, int is_le) > { > diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c > index e7e821d3b3..ded0a7f618 100644 > --- a/libavcodec/intelh263dec.c > +++ b/libavcodec/intelh263dec.c > @@ -21,6 +21,7 @@ > #include "codec_internal.h" > #include "mpegutils.h" > #include "mpegvideo.h" > +#include "mpegvideodec.h" > #include "h263data.h" > #include "h263dec.h" > #include "mpegvideodata.h" > diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c > index f01c942f04..af054360d8 100644 > --- a/libavcodec/ituh263dec.c > +++ b/libavcodec/ituh263dec.c > @@ -48,6 +48,7 @@ > #include "rv10dec.h" > #include "mpeg4video.h" > #include "mpegvideodata.h" > +#include "mpegvideodec.h" > #include "mpeg4videodec.h" > > // The defines below define the number of bits that are read at once for > diff --git a/libavcodec/mpegvideodec.h b/libavcodec/mpegvideodec.h > index 1af8ebac36..10394a616c 100644 > --- a/libavcodec/mpegvideodec.h > +++ b/libavcodec/mpegvideodec.h > @@ -67,4 +67,14 @@ static inline int mpeg_get_qscale(MpegEncContext *s) > return qscale << 1; > } > > +static inline int check_marker(void *logctx, GetBitContext *s, const char *msg) > +{ > + int bit = get_bits1(s); > + if (!bit) > + av_log(logctx, AV_LOG_INFO, "Marker bit missing at %d of %d %s\n", > + get_bits_count(s) - 1, s->size_in_bits, msg); > + > + return bit; > +} > + > #endif /* AVCODEC_MPEGVIDEODEC_H */ I think you can now remove log.h from get_bits.h. That always bothered me. - Andreas _______________________________________________ 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".