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 3CBC94228C for ; Tue, 31 May 2022 09:24:34 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E4F2568B65A; Tue, 31 May 2022 12:24:31 +0300 (EEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 44F5368B607 for ; Tue, 31 May 2022 12:24:25 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1653989070; x=1685525070; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-id:content-transfer-encoding: mime-version; bh=v0gqNEzjAW+IJ0NlLFPw6m4CcREsfW8+BhbXzryZXZk=; b=Q5IgQ8kpxdgJirKhJ8PXJ2Jus2v0Fvxff5aR5HHqVIUgp+jNj6MejFRn p2aGeM94ENjo+dX3SdzCB3lk/nbrE7pH9zBShPMko0ovh73OUNfcCFlFS +Jr0fzwwPk+mZyUfjOBAQMoD5HUWywjrWt47QB1bcyYsatIJO2rJ6zxlh AUzU2a9OUz3+uYkpzKZ6lFdIas5dsnCKIDbaPF4bwEsk3TITd6suLhctC cOfNvMgZqU+3yXp9FJg1ICCP9KS2DzNiOOrGj4PFlaaHR9oCGejW91zfL aFoOPXLYVYZiEm1ESjDS8hXIQntEnlZblc98OZCnf+qAUAVy6kgLILBNT A==; X-IronPort-AV: E=McAfee;i="6400,9594,10363"; a="338239172" X-IronPort-AV: E=Sophos;i="5.91,264,1647327600"; d="scan'208";a="338239172" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2022 02:24:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,264,1647327600"; d="scan'208";a="605578602" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by orsmga008.jf.intel.com with ESMTP; 31 May 2022 02:24:23 -0700 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Tue, 31 May 2022 02:24:23 -0700 Received: from fmsmsx605.amr.corp.intel.com (10.18.126.85) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Tue, 31 May 2022 02:24:22 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Tue, 31 May 2022 02:24:22 -0700 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (104.47.73.48) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Tue, 31 May 2022 02:24:21 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H/pOasqsFsapeub+Rjn3jn14f+f/0lgx4UxQ22xigaGU2g4fWkvAijx0e0Tq8h/JzE2aLUr+1m9KM+aL131sEC83lPp4Z+m3XPN+Hbx2BeKve1x1lLB5u531KSr5w1m0eDz0p7u4IBTFkFCblTzpkwyNNglHXTGf4BjvAehnxG8wAWt0I4dkJ2wVBuC8zkYnao6DY251aNx+xIXqPzmDGtlhugaaboQd3KCHrL16hvXlK0H7dJjMGruVsUUljRnW1IYMmLFtlmhdmP5QA/C+s1JrhYGfRi8NfK43tK4LLpeovv9bsV2Kagq6kyuD/7zseuX28Aq2qNb5E5nk/bUoUw== 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=v0gqNEzjAW+IJ0NlLFPw6m4CcREsfW8+BhbXzryZXZk=; b=gKpz4aDDqEe7QtNT0uunCbeGArPM3TZtt0SIvzU0MHNw5OMBSPRBQHTwRbfvN3n0hg6RJ//muhKrp2T2mZy2cr1o1lrNho+cdvhhtlHMq8/8OoxCeSBlJjukbReg0CRNptZ5JR6A/aegeMErvXgLpXTwYuR93R92C0N80QMwMKpqRu9k57vi40LyiPfXWqqmzkEjx4ZclaBLRTgH6f/GpAORJq1nfBO+IzsQQUlban5CFiWAevkh/zvGBD4AjdFGb//t/3FGeg3p+/HJ6/LIWgHXmDw+sdH3R2WR9i/FoLqldcb7FLBqLF//4L6I9bhuSgO+svjxPna3rpaHJFQtmw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from BN9PR11MB5515.namprd11.prod.outlook.com (2603:10b6:408:104::8) by CY5PR11MB6416.namprd11.prod.outlook.com (2603:10b6:930:34::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.19; Tue, 31 May 2022 09:24:20 +0000 Received: from BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::2d06:ec38:937a:da73]) by BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::2d06:ec38:937a:da73%6]) with mapi id 15.20.5293.019; Tue, 31 May 2022 09:24:20 +0000 From: "Xiang, Haihao" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH 3/6] avcodec/mpeg12dec: make mpeg_decode_user_data() accessible Thread-Index: AQHYcNf818l2qQZGL02akj1BWshzj604vrmA Date: Tue, 31 May 2022 09:24:20 +0000 Message-ID: <256533db2dbd7bc345e84dc3159d99696d509e14.camel@intel.com> References: <8082c3ab84a30299f1b8e930a877cf65c3b48b00.1653552529.git.ffmpegagent@gmail.com> In-Reply-To: <8082c3ab84a30299f1b8e930a877cf65c3b48b00.1653552529.git.ffmpegagent@gmail.com> Accept-Language: en-AS, zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: Evolution 3.28.5-0ubuntu0.18.04.2 authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: a3c4a42e-d3d1-47ab-e7f3-08da42e757df x-ms-traffictypediagnostic: CY5PR11MB6416:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: m1fG/hAsDuwzOKI4n2ne1bY+qIhuYqhvpIeZUwANqLUfAgjhTPSysujBEl7DhEeGI3jlTc+xIx/r6zDJNy04rBJHZbm/7rBzbvmdlK+0yPIrJEWM7QXc6cjo36MUTK3U7pNgm+vdRr1Ne/9LSd7EpP4gLk5Ulp4fV4Wf0rx3ssThTBPrg2Sp7sIwtiZLAVTL1KZtF+0ZJ8WCqOMM+biU4Y4fiQCwastbYixawt3ZFnwNXfFZvXo5AW38rwiVOaZzD4Mfa4Jsg0uSZv+q5hEPltgZBpeJ+VkcpwjpVEKYqrwq7WxTJb/ozYlU6xPvtUzcK1oUHUHdSSvC+t2faImIQJ7Einfft+wFwYg/ek3w32jRA1XOHgPMV42vWWCzgnmQClmW1J+dY+wna+hlwnE3z9ugBzBzgIWQGQRl6jZ4uvk/iZaNg2sKEftq9M5H4wU2M4vMGoiDwcgWwmZX7+uNvBJ+q71wrdNSHjQbt1Bu+zZxurKD2rk2EhU/9C9Cwiv+JAiMJXFWowGR0WHWXjK7iH1fCRvU6gggwQ6GM2GH7GQ9zEhA57FawVcLPZQtgXziMFfD63klJB8yM2H94xds9V3gusiXM3NtXyQ49oD8reB5ZXzXizoPTXL8QJWzJyrqDUi9hyx5/vHfpG8D0jOFQy3oNIJcFuLp+JAJVerhC9Oju3uKkAryJiuBUIUn8ZQFjbji60yoX9Myt4Q299b0DRHBGzP/iE1F/kynoA+P5gE= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BN9PR11MB5515.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(71200400001)(6512007)(6506007)(26005)(6916009)(316002)(8676002)(6486002)(5660300002)(8936002)(66946007)(76116006)(186003)(91956017)(66556008)(36756003)(64756008)(66476007)(66446008)(508600001)(2906002)(38100700002)(2616005)(82960400001)(86362001)(122000001)(83380400001)(38070700005)(4326008)(99106002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?WDBSdjM4YWhIaUZITmMzMlVOVkdPdytpWjVZRG9yNVBmZHVHZXpDdy9xWDI5?= =?utf-8?B?N3dtTGhSd2I4WG4xR0dTVElSYVZhbitvbVk0RkZOcDJSbkZTdE9PbHp3Vi9h?= =?utf-8?B?RGdRZENEeGQ3OW1IbElaUWhvL3I3MnJkazVCRXF4MDJndk0rQis5WU4zN2tW?= =?utf-8?B?RUhYZFRESkN6RTY4YUFITHhlQmlWL0RVaHV1elFJSEhQeDYxeGUyZGhiaWhZ?= =?utf-8?B?aXpHSmpxRk94R0Y3SDBXZ0Y2VlFSeEtKTXZ0bmliamNrbUl5eXJBekZVMHll?= =?utf-8?B?NzhEdnZmR05iaFcyYlR5WjJVdmFCRi9WQW5nRStKVytFLzBwWDd4M2laSlRO?= =?utf-8?B?M1NzUTU3QzFSaGVQMnMvS1hydGxPMWtMZXN2ckJTZWdORGpsRlo2c2p1MHpU?= =?utf-8?B?V2RWdnBXTWxjN1FsUU5CczdPS0FhcStGTXgwYnBla2FuM21OalZwL0tId3RF?= =?utf-8?B?WVRmdU9BM3I2U1NOY245KzVycGxsT3B0ZENHQ3pUWmJNWTQ5YXV6QWtpL1lG?= =?utf-8?B?cnBLRWtpeHRhY0dtMUVNMC91ZTAvSmdpUTR0K1NuaWNyNzRjSUJ4S2NDMDRs?= =?utf-8?B?VHRIcnF2a0ZTcUpXVXRHeTFHbWd2Mytud25CSXRycmt1NERCS21Ca0FGcHlX?= =?utf-8?B?YlUwUUJ2NzlHaXlwMnl0STFlb050ZlZ6T29SdjZnL1QrYlY1YkhjbXdDaTR5?= =?utf-8?B?NmZtcWkxb2ZoVDh3QWZJeWpkcGlrZGM1cjN5enlnMEtTODdVN3Vpa2xLSjJQ?= =?utf-8?B?d3lvV1NkSGJ1cFlzdm5XNktSNnZVa1BIdHM2NDlmS1JkY3BuRThTQlk4MS9z?= =?utf-8?B?VlQ3K1lHVDhaSmxTeDczN0lVZGdHWFhLaVdQVDZMUUVILzBhU0VBaEhnaXNI?= =?utf-8?B?QmRXMHR3b1lybmU4dVNZTTc0ajZQV1hkdXFzWEx6aWtmbklTRVBROU5TT3FK?= =?utf-8?B?QWU5UzVpc0E4NmN2MHkyd2Q0eDY0cmRIWnM5T2lEYXJaeS8xRnN2TzBBZkJq?= =?utf-8?B?K0hxTHdIZCtnemFIZmE3YXZIV0FLdzVVMERGVVpRWXhuSVQ0aFY3ZUF5cVVH?= =?utf-8?B?S1lXa282Yk9uQ1BucExvMGZkZHFnRkJTM1JIWHJMcWN3NllUN0hlL2NHUkVj?= =?utf-8?B?K2dpZExobmxZOThXUzJDc2RCSit3YmVWS1c5UGFrMXZHenoydVlyZjFBVm1B?= =?utf-8?B?UE9pOEFtUWIvNEdwbTBCMWV2MnFmT3F1cG4wVHZmK0w3L3RXZm9hSnJLc24x?= =?utf-8?B?MGF3aWdUeUY0em1aZDJHb3BCZEFVQlp2aG8zWnFiZE9uVFN3TXplS0FHSUFt?= =?utf-8?B?NzBXMW84NnR0VGlDU0I4N2hkNksyc2YyVnNpN3hPVmtQVWRwZTd2ZUxmQzlr?= =?utf-8?B?bm9lVmZ3R2cwRGw3ZmphdkVZczZiZlJxYTEzRjdlOG5DaWt1d3pzWFF3aVRY?= =?utf-8?B?TFI0aHV5ZVcyejJ0MVRPb0JRYzFWN2ZhUTAzVGluVk9NTWovVEhGY3lNQ2N4?= =?utf-8?B?NUFNUm1hQTQ2amoyVTN6cER5ZHp3VkhwdE5qOWh0djdKb0dzZE1OczNjaDRD?= =?utf-8?B?VHNZQjhobzVvS2NpUHV3a29JWDJERlNQckljdlRGdm4xbUc4cGZBdVBiNjVH?= =?utf-8?B?MVBxY2xqRzhUQmFCNk9TZGtsUkZneWdBZzZVV2JBMFlFdk5ReGF1bXM1Wnp6?= =?utf-8?B?bEV0b1gyTlZNTmdmOE5rS3hRUFU4OVg1YUsydlQ4dVptT3BWTWpNdkgreTdO?= =?utf-8?B?MHVOOWFldmFEVlJBOTY2YUF2b0RvRS8xZjJuaDRSd2xWYW1PREpsbWsxZVBQ?= =?utf-8?B?dnMzcXdPY29kUDF0dmM3UmNDYzhHTU44UzBWZTJhMTVVQTI4M3dQd0l2NkE1?= =?utf-8?B?ZS9meDNXczRtZTBkVnN4OE1FeWwrWEg2NlprUmFaZnRUUzA0UkNLK0wxTHVn?= =?utf-8?B?MVNwUXNZSkhraTU4S1h2MXNBY0h6YUtMNUVMNWxWSERIcHVYMFBTcWJBaW5t?= =?utf-8?B?VTJHOTdDd1ZJd1hQT2V4ZGFmNTR2Z2pMVmVGeGJwTjN0VVNrOUUxKy8xbXVw?= =?utf-8?B?dHk1NGVqbVV0YzRrd0JOYjJ3QlA3Umo5dDJFdUVOeVRmSkQwamF5bDdCM2ZN?= =?utf-8?B?Sk1uS3A5LzdLQUVIZUtlajQ1TWpseDYvWitzMG4zQlpqbHZva3MzUzBReFRQ?= =?utf-8?B?NUtLZlJJeW96MjlNNlJHRUIzeVh4dngxaTBIa0VOMVhLaUN0OWwyTTBZcmhJ?= =?utf-8?B?ZXo1Zk9VQkRZTXlvaEN3VUdnalRBVHd3aURkRHpjSENZR2JwUkYzYXVlMVox?= =?utf-8?B?eFlKNk4zdGhHa0JvSm1IdTV0K25RQ1Zwbmd3Mkp0eHVwSHdCS3ZQN01WT0Zz?= =?utf-8?Q?zu/eM2tRPeJyt0dI=3D?= Content-ID: <0934ECF7436B364989AE3C1FD68213CC@namprd11.prod.outlook.com> MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN9PR11MB5515.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a3c4a42e-d3d1-47ab-e7f3-08da42e757df X-MS-Exchange-CrossTenant-originalarrivaltime: 31 May 2022 09:24:20.5204 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: n96EMtfQXysGe2rN7hhds1IMBXQjsNwRgS0W6NRxXboW6WIDBf60zJh3ViDf6Gsa5NTDgHq9dRqFdKSHP/wI1g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR11MB6416 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH 3/6] avcodec/mpeg12dec: make mpeg_decode_user_data() accessible 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: "softworkz@hotmail.com" 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: On Thu, 2022-05-26 at 08:08 +0000, softworkz wrote: > From: softworkz > > Signed-off-by: softworkz > --- > libavcodec/mpeg12.h | 28 ++++++++++++++++++++++++++++ > libavcodec/mpeg12dec.c | 40 +++++----------------------------------- > 2 files changed, 33 insertions(+), 35 deletions(-) > > diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h > index e0406b32d9..84a829cdd3 100644 > --- a/libavcodec/mpeg12.h > +++ b/libavcodec/mpeg12.h > @@ -23,6 +23,7 @@ > #define AVCODEC_MPEG12_H > > #include "mpegvideo.h" > +#include "libavutil/stereo3d.h" > > /* Start codes. */ > #define SEQ_END_CODE 0x000001b7 > @@ -34,6 +35,31 @@ > #define EXT_START_CODE 0x000001b5 > #define USER_START_CODE 0x000001b2 > > +typedef struct Mpeg1Context { > + MpegEncContext mpeg_enc_ctx; > + int mpeg_enc_ctx_allocated; /* true if decoding context allocated */ > + int repeat_field; /* true if we must repeat the field */ > + AVPanScan pan_scan; /* some temporary storage for the panscan */ > + AVStereo3D stereo3d; > + int has_stereo3d; > + AVBufferRef *a53_buf_ref; > + uint8_t afd; > + int has_afd; > + int slice_count; > + unsigned aspect_ratio_info; > + AVRational save_aspect; > + int save_width, save_height, save_progressive_seq; > + int rc_buffer_size; > + AVRational frame_rate_ext; /* MPEG-2 specific framerate modificator */ > + unsigned frame_rate_index; > + int sync; /* Did we reach a sync point like a > GOP/SEQ/KEYFrame? */ > + int closed_gop; > + int tmpgexs; > + int first_slice; > + int extradata_decoded; > + int64_t timecode_frame_start; /*< GOP timecode frame start number, in > non drop frame format */ > +} Mpeg1Context; > + > void ff_mpeg12_common_init(MpegEncContext *s); > > void ff_mpeg1_clean_buffers(MpegEncContext *s); > @@ -45,4 +71,6 @@ void ff_mpeg12_find_best_frame_rate(AVRational frame_rate, > int *code, int *ext_n, int *ext_d, > int nonstandard); > > +void ff_mpeg_decode_user_data(AVCodecContext *avctx, Mpeg1Context *s1, const > uint8_t *p, int buf_size); > + > #endif /* AVCODEC_MPEG12_H */ > diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c > index e9bde48f7a..11d2b58185 100644 > --- a/libavcodec/mpeg12dec.c > +++ b/libavcodec/mpeg12dec.c > @@ -58,31 +58,6 @@ > > #define A53_MAX_CC_COUNT 2000 > > -typedef struct Mpeg1Context { > - MpegEncContext mpeg_enc_ctx; > - int mpeg_enc_ctx_allocated; /* true if decoding context allocated */ > - int repeat_field; /* true if we must repeat the field */ > - AVPanScan pan_scan; /* some temporary storage for the panscan */ > - AVStereo3D stereo3d; > - int has_stereo3d; > - AVBufferRef *a53_buf_ref; > - uint8_t afd; > - int has_afd; > - int slice_count; > - unsigned aspect_ratio_info; > - AVRational save_aspect; > - int save_width, save_height, save_progressive_seq; > - int rc_buffer_size; > - AVRational frame_rate_ext; /* MPEG-2 specific framerate modificator */ > - unsigned frame_rate_index; > - int sync; /* Did we reach a sync point like a > GOP/SEQ/KEYFrame? */ > - int closed_gop; > - int tmpgexs; > - int first_slice; > - int extradata_decoded; > - int64_t timecode_frame_start; /*< GOP timecode frame start number, in > non drop frame format */ > -} Mpeg1Context; > - > #define MB_TYPE_ZERO_MV 0x20000000 > > static const uint32_t ptype2mb_type[7] = { > @@ -2198,11 +2173,9 @@ static int vcr2_init_sequence(AVCodecContext *avctx) > return 0; > } > > -static int mpeg_decode_a53_cc(AVCodecContext *avctx, > +static int mpeg_decode_a53_cc(AVCodecContext *avctx, Mpeg1Context *s1, > const uint8_t *p, int buf_size) > { > - Mpeg1Context *s1 = avctx->priv_data; > - > if (buf_size >= 6 && > p[0] == 'G' && p[1] == 'A' && p[2] == '9' && p[3] == '4' && > p[4] == 3 && (p[5] & 0x40)) { > @@ -2333,12 +2306,9 @@ static int mpeg_decode_a53_cc(AVCodecContext *avctx, > return 0; > } > > -static void mpeg_decode_user_data(AVCodecContext *avctx, > - const uint8_t *p, int buf_size) > +void ff_mpeg_decode_user_data(AVCodecContext *avctx, Mpeg1Context *s1, const > uint8_t *p, int buf_size) > { > - Mpeg1Context *s = avctx->priv_data; > const uint8_t *buf_end = p + buf_size; > - Mpeg1Context *s1 = avctx->priv_data; > > #if 0 > int i; > @@ -2352,7 +2322,7 @@ static void mpeg_decode_user_data(AVCodecContext *avctx, > int i; > for(i=0; i<20; i++) > if (!memcmp(p+i, "\0TMPGEXS\0", 9)){ > - s->tmpgexs= 1; > + s1->tmpgexs= 1; > } > } > /* we parse the DTG active format information */ > @@ -2398,7 +2368,7 @@ static void mpeg_decode_user_data(AVCodecContext *avctx, > break; > } > } > - } else if (mpeg_decode_a53_cc(avctx, p, buf_size)) { > + } else if (mpeg_decode_a53_cc(avctx, s1, p, buf_size)) { > return; > } > } > @@ -2590,7 +2560,7 @@ static int decode_chunks(AVCodecContext *avctx, AVFrame > *picture, > } > break; > case USER_START_CODE: > - mpeg_decode_user_data(avctx, buf_ptr, input_size); > + ff_mpeg_decode_user_data(avctx, s, buf_ptr, input_size); > break; > case GOP_START_CODE: > if (last_code == 0) { LGTM -Haihao _______________________________________________ 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".