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 31D7D43942 for ; Sun, 3 Jul 2022 13:31:41 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E9D7868B9DB; Sun, 3 Jul 2022 16:31:38 +0300 (EEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064047.outbound.protection.outlook.com [40.92.64.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E42F68B99E for ; Sun, 3 Jul 2022 16:31:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FCXwpAYCetqNHqty5jOLIayC16Nf+jTtQMY2pbw2nmdCN0njqLvlEBQgilwz9qRp8O+U7R89HqMxdtu8z/slDKdhjf7r3vA345VC5M9izKNDJ/Dl4kBV6U1DOINORV2qJqfltG5qiC7Xjvu0fDX0CV4V43YQCfzKF3LcYvUUCWw9juC+oEYq5PMcueoG86RtA5zLC4FBw/rNiJH2D89jsaF+muebdc+/n+9nGcD3NsC8gFouVfZb1Y02BYuLqjG9XkIxVw+Rh5qEMgjDKwsAqWhtNtDWju3OZWIL0VU24mmibXanmnDVKS0krEsIteYQVc4nK6XwgicxpUF9EXtScQ== 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=9Q0iCHyTGLHM/D98DRX/h8lZ7euxd/2nM0RkHXNJQSU=; b=meiHnQXZPdDupN30M3cMlmEDGnWPAEqz/V/bGXcxW7DlYoIVvoeCVtuHir52+NJ6cyQlHgS08scnDP/B/fLCiFtHcOsxXXOtx7UuOQ/jeikLxXdr33y0nZQXH3GJjCc68qVJk6v9QvrT3y8XD+DBEz1FyQOCL+XqNSLwDmNuwHO52MFHEBIeTMlZbYCXHNJy/0NBSY5VkG9UH6xY+h4kK3Y6D+jPnQua/ZK/bClGHrcz2Z/LkWwOvZh1rXwt+V0zWQ4ArukxJCyyGcN59/XzmfSr+ukSCC7A6ToZQoem37bMlJ0KApRKVwoFGYPGqPHD7EYUTg2N536/zUqG8iIL/w== 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=9Q0iCHyTGLHM/D98DRX/h8lZ7euxd/2nM0RkHXNJQSU=; b=OJb67HTBVdg+4Dkah7+paQZI70icX231cnyeXoliO4wP7mwYcasWZ29oDobSyYNSX2X4DtckrcKlTHzl+Gl00k1kpFvrffSohWZLlBeYcFswNfzWI78IfANISUtKC/Of19FOYu7ibLLBl2iGtJ6cQ3KbvFk6S14sQmD+YDzuGJMIhZBcRxetfz0RIzNh4LMPYpJEJEX8D57Tr2qnby0h0dy6FUTI2vxeNKTIGTmUVep2QXVHzyshnzqX23hKiX6pT/JP+db6QtuGxq+TUNbUdTUgyPDCGAvV2N5tBW6ooevUUGKDDl3WyXFoEnEozojD+hgaTFq5hNxJp7eBrYgjhQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DBBPR01MB7724.eurprd01.prod.exchangelabs.com (2603:10a6:10:1ec::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.14; Sun, 3 Jul 2022 13:31:31 +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.5395.018; Sun, 3 Jul 2022 13:31:31 +0000 Message-ID: Date: Sun, 3 Jul 2022 15:31:29 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220703102636.32523-1-anton@khirnov.net> From: Andreas Rheinhardt In-Reply-To: <20220703102636.32523-1-anton@khirnov.net> X-TMN: [WWrcKGsta/thDk+waM7IoDTO+ZEN6Xhw] X-ClientProxiedBy: FR0P281CA0017.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:15::22) 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: d495a799-f121-4309-6665-08da5cf85742 X-MS-TrafficTypeDiagnostic: DBBPR01MB7724:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5iCVaQQcHJ9R2TG6mxrQXJg2wb7HMYy22bgACC39DjvFPcgCKK1TEekK/3xTHRrlqC0TZuNffwVo8MX5haXZh+gWTb/U2KUsfuqVQSYQuLQQ8zYwTIMfaDrB1hMMVFlS9VvJm/+j2dl7DFfip47Twoc9gB71WpjQZTZpI7Fx1otp9czyUFaLAFTHE8p8QsjxIx8T12IyxecUzTNTOFS85Sjsqa9Xg3n+FEWgl2WzahX5hb9LjBR/eMuJrHwQKjHXp8w/XInUIY/PtFL1AMGxwViJzEangDpb7W2WacHCDvWdrxwuQj2IdXKd7eE64G8imNyDNpE5GGJicQC+u13LebFeuRN35hGmaYgvpIe8WGGNvOkLO7tStrZ4dQkJkZ/JrXZSzY9CxGH50pB0rKFCUyAwVRBZ/tUDTY0mhCC1HQyt8h1nOOTTUYbNubxMxvU6Ax36rK1Ue4jw0eIM3w5cGBImkD7A36WQbybMdyCCX8fzeIN1UoORlNZZIvGzsQRTcoiSb1aScCS7KFNsOw4zDyedM9yxyLmcZPE5qHYaID2lrT+Iavtk1u3+C+rC4nEwtiQUgwdzvqcsl2pyb5d7P6TnOftjA4vDDrcw1HPTdvNXIwOfmc1QNBreyQ8WzJ19fYXdjFpXM6TAzr9j3m1xsQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?d2gzQVROSTRYUWsvUGV4REQyS3NFQm1tRUJ6VFJ2eTBRdWJUVzNTekYxbzRE?= =?utf-8?B?OFNrdERIRUFOQ3lrM05RaFJwR21aL21oSzVrMDl5UzV1ZmQ0YWc2ZUI5Ymds?= =?utf-8?B?Rnl4RHNYZTJpT1A4NW5ES1k5WFhSbEtmNUN5NVBKUG9WK2tMQ21ydTgyNTB4?= =?utf-8?B?Q1Bad01VUGxPT1dEdEY2c3V0Ulk0QlU0YjFvZWJPSldnbGpTV1hySnUvTytw?= =?utf-8?B?c2FtbDZHeFk1WERmUGw3SW5YYjJZZlFEYys4QkNiNzdnZUV4R3ZMem9raDJV?= =?utf-8?B?MEcrd2FwYXRzMENHbW1iYzlXNjdwczlVVS9oalZPNzgwNUVkZzl3NEZ5R0ZV?= =?utf-8?B?eXg3OTBjOVVnampRVFBkUFczZFJZZXM4OFNicm8zR09HaTVOMm5Ka09VZ0lF?= =?utf-8?B?L3A3UEVmQ0pHSG9nMkIzVnd0V1pKaDM2SVdmOFhvaWJWenJ0MkM0dEJPTjdL?= =?utf-8?B?cGh5R0xBaHUxdjBhZkNudnJaQ1M0MCtjTkZDdUFuazMwZ0NXTkdkbHg4WHg5?= =?utf-8?B?TkdTSmpXdUFuMllsbzFEM0RYVnYxRDViMVVwZk1YR250QUFXVk5LT3A5Q3FK?= =?utf-8?B?aWY2SU5JbHBkc1UvMi83TitSWkkvZTBNZUlYSW1Da2RNdG1JSVNLNFFyRjla?= =?utf-8?B?bHprdU5yV09sNlpKc3RxSEowS2dldEljV21KTkxLOVN3L3VjczJyQVo1MkdE?= =?utf-8?B?eTE1NE90Ym4rU0tQczNDUGVYemRmWmlEQk9VWllndVBSeis5RXdBeXcxUXBi?= =?utf-8?B?VTY4UUNsajBtYVpGdmhhTDFyTGhUYW1UakM3Z2pXcVNWelpwcE83azJra1pw?= =?utf-8?B?aFJHTHVlSkZzYkF0dE0wQzh3cHRhYmx6T3VTbEgxeW9uSzZLRFh1NnlMcU9C?= =?utf-8?B?OTJDWTNDOHhrQmVGL2hxT0prd1VaaTQ2Sk4yaFNjbGVuSlJheDVtNGkrbVhK?= =?utf-8?B?TGxJR2JIa3hMTS9KRTVFT0pITlhGZlVnZUZkdDlZMmliSndEbWNUSzdMa09H?= =?utf-8?B?M3VXZSsrSUVxVWtkN0hsTkF4eHBheGZTVkhEWnBBOHRNYURiME5yYUJXdEVm?= =?utf-8?B?ZnN1MDhTaTl0NnlUZnpvMFRjZUtySm83K0VaQ1B4TVRzdkFzc0JyKzF1RTZW?= =?utf-8?B?TUordmVnQi9ic0Jnblpya3B6aENiM1NNaXFNNWMwdllqanBCVC9MRytaU0lv?= =?utf-8?B?bDlzRE5XbU5xV1VBNWIzSnZzNThXUnE0MUtlNmY0bkFMRldrWWQ2Mmg0L1NL?= =?utf-8?B?eURQQ0Q1MTJYZTJNUTNJRHF6bVlaRzRiVXpieG0rVDE4c0l6YW1aekxXaVM4?= =?utf-8?B?Y0lDajVUcEdPZGV5eW9SbEpobVF4RGpyb0EweW9qY1RjM0JPS21pR2xldFVu?= =?utf-8?B?QTVubitJT0VMRlNBVXhLQTk2WXpSMkZIZ045b2tRQUtzd0c2VC9Ed05CamxU?= =?utf-8?B?TWdmVWdISzYrZWcwOFEra2RpVnY4SThLUTRxVnhoN3FNR1hhb2NkVTlkRFRm?= =?utf-8?B?clZGYjBZNDVnYkdBNm53N3JIMTNlclFhU2FEOXl1UStVNzdRaDRaMWw5MUh1?= =?utf-8?B?UzdpV2JVaGZ2cUNjYWlNMG5OWjRPRWs3VklPbXJnNWE4eWo3MTBUUDZjdjFT?= =?utf-8?B?SkNpRU9IS1o4N0hIVjMzQTRjZmloT3lSVDVWbUY4WjRKZkhSOHpYV0VaSm9O?= =?utf-8?B?MGJDR2VEc1JOckRCVGlTRktYZEFmQ3VZUmVBWEt4QXNXQUlQKzhIR1RLbmdO?= =?utf-8?Q?p3rdyzhB4QPgCmFg+c=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d495a799-f121-4309-6665-08da5cf85742 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2022 13:31:31.4564 (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: DBBPR01MB7724 Subject: Re: [FFmpeg-devel] [PATCH 1/3] 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. > --- > libavcodec/get_bits.h | 11 ----------- > libavcodec/intelh263dec.c | 1 + > libavcodec/ituh263dec.c | 1 + > libavcodec/mpegvideodec.h | 10 ++++++++++ > 4 files changed, 12 insertions(+), 11 deletions(-) > > diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h > index 16f8af5107..992765dc92 100644 > --- a/libavcodec/get_bits.h > +++ b/libavcodec/get_bits.h > @@ -31,7 +31,6 @@ > > #include "libavutil/common.h" > #include "libavutil/intreadwrite.h" > -#include "libavutil/log.h" > #include "libavutil/avassert.h" > > #include "defs.h" > @@ -610,16 +609,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 */ You probably want to add a lavu/log.h inclusion here. LGTM any way, no need to resend this. - 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".