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 1C32742E32 for ; Mon, 9 May 2022 19:29:15 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DE82A68B361; Mon, 9 May 2022 22:29:13 +0300 (EEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073099.outbound.protection.outlook.com [40.92.73.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4CDE368B1CA for ; Mon, 9 May 2022 22:29:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n2GlE9P7obA9d8agRh6BML+2qtPQk8fQENZNaTkHk5JVbHUbFamJfPI+j7lEn9Z23TtsNzh0m8ScWKsx95QUzsP99kFNiUHRJVFSbvUOzH98whJp5itWUqPbH7P9Wu7LTnZNsYU4Mvebcrjh1bhF+KNosJC+ewi3au8KTVYgsez8zewiG1OmTGqfP4SAnUWjr/hjcBAWSwhOGsCIkE3+6QJRRaoX8WjIsaNZ9CuhGGe1EXfiM5U15BIcr198weErTHT5UzQyRjO5+bb31gLw5/oojWDp/e55xSluSJQVTu1wgc3wBNAcK2uwgHHL+h3WBXyLgZW5eGAbuKJLVXU8tQ== 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=gskcFP0SbyW5CDqmoEL+EyGWBUPjVZIaZnduYhodgzg=; b=iAy1pzqI2+tS1wFDjsRlNkR8ksqnsd39gaNf0eNUH9WO9PTstUS61wsR37iOL8YBBvAxrsrPuOf0uV/qcrg550lKvDEFA+GihSAKjuJtbesTBQCcyiVdV7WqVwuTC8yncLXcv3cCxMu3IpEN6YY74DwkorgpNsMWo2oZZaRoCGBAnLwYyR7z5yo85imaAeSIvN+jxYwJvHoyymJhyFqT1F/UFeKJH+FU2mr0A/rLFwfhA6uMliJgb/7qNLu0C9yIEPGQg44QaysgoGWmXegF6skAjwBc4vzv25m981cJIEikUZTm7IIp0h800slZb6SI/f+a3ZLWh1lwVZOMEUjsWg== 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=gskcFP0SbyW5CDqmoEL+EyGWBUPjVZIaZnduYhodgzg=; b=AXOf0C/45daL0PTNuGHyLy6n0lgk0e8nDYkbObAVlM30/5g2ZcGSB9fAvNwDaniZq716cVffvfy7BHOqufyqIGcmK/ejA4IQQoTqbhSk36ezmLpmn3K0qaOVS83Kgx0CsY7kD4wLUjFmLqd2wFGY5xFSKqFbQkF4DV1nZ3KuNmOKaVOiVJg9qW2gmmLXtRusmEEQ3oOMvvA/T74Sy6b3wYLoNLYI7nj2I4IclUKI8R8CRvCJSDWRaNLkerOlr71k5Us04YjgNXk39yJ/cmog60uD4N89le1kZI3wrkLoURj3BvhETOBEauFIb4KMhiFv5CbbFPNKY4PAqbqGxeS+qA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM9PR01MB8166.eurprd01.prod.exchangelabs.com (2603:10a6:20b:411::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.21; Mon, 9 May 2022 19:29:06 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%9]) with mapi id 15.20.5227.022; Mon, 9 May 2022 19:29:06 +0000 Message-ID: Date: Mon, 9 May 2022 21:29:04 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [7RbFofLM/ilbT3I3be/ItfCXo/6q1p1X] X-ClientProxiedBy: ZR0P278CA0147.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::21) 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: 1836e5d8-1e4b-4176-cd5b-08da31f22edc X-MS-TrafficTypeDiagnostic: AM9PR01MB8166:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: i9wJ1h/mO+Q+aUmYpiTeKqrOoN73fy4SPdjGHM562Y6Mv6Y+r+KUnVvETlbu9/YW1PL6GJvnGjgGo1cP2CW4frMj4lnRy8OA59O8ryBdJLWOaP+CjObEjxH31WFtlW1VA8V/HBovWbx+LX6GJ4eq/j6MnoAcVizvmE2/K7AIyLMuOLo4CM/Olag1cBBSEsiYswGG82MJOyywpw6/Zkx4bSb9bBxZZ6XGwyZgoA7f0GohJFhoQQA6iMvF1mI6LRG9L3WOqlrEORb73XA6IIxLw2596Fi5CaflRzdgaRFubVBBs4GgSRU09NKbj9xfk8jHYbq3F9rJXV4GccCYZGDNUrH9FcmJZ0ADMiidT3GzcAlwgIh24hEUos+jKg3HL6/j+Oilzx10/OukXEjZZ+Dyfz1yB1Da0rjjZHIZa1+Pg5jaDAfYpswUTDIxYTTEXBttTm6RRfYJ5r16leGxs9Mic264B79hMN/dDarJy+ygloHD0zm7DA4+qEGGfCAG1Yq/alz+6+QSzNFPHeRxeo0GUOKxYK5wsvyVLB9IrTi4B6WYldRgVo8jS+XOGzyuAeaWdaWhnjta6xK0vUlI2wxWHwGUY1YUgTRZsVvaHrm6BJq19v3II23KBkl+Y6nLd4c4Nk0p85+tkbeVgbKBC4ht8g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QW1Kbklab250Y1A5bmFJL2d5RzNycDdMckd5MU1qODBoZ21CSmIreVRZQ1Rh?= =?utf-8?B?enRGU05mNWQ5L0g4bjV3Zkh0NkxSOGFvQnF0THdzVTNlbjRXblg3dFEvU05l?= =?utf-8?B?ekhOUTZ3Z0thRHlseDJ5WVY2cTNLUVEwNlhWV1ZFNGhzcUVOMTJqRXUxV3JV?= =?utf-8?B?TGQrYyt2WkVOMmtxc3NIZVB3dDlIem4veXBGRitnWTI0NHhkYXNRWEIxM2Rs?= =?utf-8?B?VVZrQ3cwUEF6WVhFUU1yRHJ6WWhxZE9kckp5a3RBekE4anpOTXd3OFc5ZjIy?= =?utf-8?B?UURZcGVmbXhvVzlic2NZYlNHY2pWVHpieWJpSHRwYnd1UDd6bFMxYzY0eU5H?= =?utf-8?B?aUhkWkRoNFhKR2RCMGdwNVg3NUY5Sm9NY1ZKYWgyaHV0L21pT1BlTmNtRVpF?= =?utf-8?B?a05Lb0Vtb2VIY2NyVnMrUmd2VFdPQWdIMlNnbWJCOTljcWdhODJkbUF0NDlO?= =?utf-8?B?OU8zd00xSUFYcTJjM2x5cU83VEVaWTREbW56Yyt0NVhSZWppSkpYbWQ3S2Ja?= =?utf-8?B?VFEvdDYxdlpHR2NJMHEwOHVFdGVjb3Jydm0vTWFUYjJpdk5aRjY3UTZ1VHBV?= =?utf-8?B?em02cGVPZFM5S2Vlb1F2RUYvSjgrZ042SW0xUTdTaTJKZlRxMzM5MStHN2pj?= =?utf-8?B?SXNpZ0N5S3BGSkVkU3VtZkM1bUMzYnY1Vkp3Qjc1WW1oMldTQXBXNDlzVFpZ?= =?utf-8?B?c09nemt4VmJESWxSYTV0S0FadjlQTk5WZEdXdmtwTmlJbGc4dVVIeDVPUVU2?= =?utf-8?B?QUU5bGhxNnB5Ym4vUFpGYmlVMS9GS1lxbytqNXNZb21DVkxaQiswNnR2NlR1?= =?utf-8?B?cjhIQWhKcUVrQWZxNzJSK3RpbHZGVTgwL1BRL0w5N01vNXpYWkt1K3k0Yy9E?= =?utf-8?B?Y3p3WFRCbFR3UU5HdVBrM3dXVGppekVxNzZ6TUg1M1FuZ3BMR21yQkpheGlm?= =?utf-8?B?NnZNdVljVXc1ZDFlTEQ1Zml6WXptUmZ1bUpYcHdSTXRtaHZQVzBEalVDdEpJ?= =?utf-8?B?blI0dDlTbHNKdTZ3V0lpZzlPZEVXODdpaTU3YUpLUjR3VHBrRDJTcy9ZK3pa?= =?utf-8?B?ZU80MUVkTitETE9tR1JCVnNoMWRhM1JNNXJ1N3RWSmtodzArRTNkSWVuK0F5?= =?utf-8?B?Q3EyM3lzSm8yM2JNU3lQaUVvbWd2ZjNFSkpVeDFadmQ3MVFnVnkrRFJwZHVF?= =?utf-8?B?WHg5b1ZzQXlHOVllc3hTM0hmZ3N4c1N3SUt4NjlxcjFaK1RZRmZCS3QycFFD?= =?utf-8?B?QUQwZ0E2dXd1blQzWG5RMDExcU1UWjV4QldKYUQ5NFVwV3pEMFgrMFBnYzFO?= =?utf-8?B?eXgyaENpcmVUaklwbUEyQnlJaUhTcnRPYmxFN3c3RWJNU1lrRm1sSU5Sa0p0?= =?utf-8?B?U3M0NGQwY0JGM2pJbytnUG9tVWFZc2FlZFVKU3F6VEZrQ0lnUXFvbGozbmRV?= =?utf-8?B?MmVZK1JYRmZQd2JXWkcrRXU4ZEZ2aTRieVdUemhCNFF3Y0lqRWxEZDlJWDVY?= =?utf-8?B?ZEsyVUk1Z1E4ZVZtS0xtTXlSS0d5dDVMSEF6VmZ4Z3d5V3JjOTJDek4zNi9J?= =?utf-8?B?c0FHUHVSODhxT2k2NXVoaUxEdVNMU045a3RzUDVSd05wOEFDWEVxbXZJQm5w?= =?utf-8?B?NkxYNTBOaE00eURxU2ZIMWxUQVYwS1RIMVpLcXlySmNwVmNlWWdZS3M2Tk9y?= =?utf-8?B?eHJqb2RsWDBjbmk5d0R5b0cvWjA0TmxDL2c0NlZyYnpjL3NNS3NVSjhEZjJP?= =?utf-8?B?aUFZNTZPTkFyTkZTZmQ4SFZDY3Q4MS9xTFM4cUNwMlZnL2ZtYzk3UlErRWhv?= =?utf-8?B?d3dCb1c1ZE9TbFcxeXgvNmxsR2tlMHI2NWtxaWlIREZnYzFLbUJXOFVwalU1?= =?utf-8?B?VTVTRlBxMEVjekZJQjBIMkhDbW5uRzB6clFaaEMxZ2l3L3pYdWd2eEtnZCt1?= =?utf-8?B?QTI3U1dtMlI0VWhzU05DazBaamsrcDk1Z3JEMlFTdVpDeUo5ZThEcVBHZFBB?= =?utf-8?B?ZG9QeW5iRm5RPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1836e5d8-1e4b-4176-cd5b-08da31f22edc X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2022 19:29:06.7540 (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: AM9PR01MB8166 Subject: Re: [FFmpeg-devel] [PATCH 1/3] lavc/pgs_frame_merge_bsf: add bsf to merge PGS segments 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: Andreas Rheinhardt: > From: John Stebbins > > Required to remux m2ts to mkv > Minor changes and porting to FFBitStreamFilter done by the committer. > > Signed-off-by: Andreas Rheinhardt > --- > Changelog | 1 + > doc/bitstream_filters.texi | 8 ++ > libavcodec/Makefile | 1 + > libavcodec/bitstream_filters.c | 1 + > libavcodec/pgs_frame_merge_bsf.c | 191 +++++++++++++++++++++++++++++++ > libavcodec/version.h | 2 +- > 6 files changed, 203 insertions(+), 1 deletion(-) > create mode 100644 libavcodec/pgs_frame_merge_bsf.c > > diff --git a/Changelog b/Changelog > index 4d467eb741..1bae64075e 100644 > --- a/Changelog > +++ b/Changelog > @@ -14,6 +14,7 @@ version 5.1: > - colormap video filter > - colorchart video source filter > - blurdetect filter > +- PGS subtitle frame merge bitstream filter > > > version 5.0: > diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi > index fc2c71fc12..50c95f035d 100644 > --- a/doc/bitstream_filters.texi > +++ b/doc/bitstream_filters.texi > @@ -695,6 +695,14 @@ for NTSC frame rate using the @option{frame_rate} option. > ffmpeg -f lavfi -i sine=r=48000:d=1 -c pcm_s16le -bsf pcm_rechunk=r=30000/1001 -f framecrc - > @end example > > +@section pgs_frame_merge > + > +Merge a sequence of PGS Subtitle segments ending with an "end of display set" > +segment into a single packet. > + > +This is required by some containers that support PGS subtitles > +(muxer @code{matroska}). > + > @section prores_metadata > > Modify color property metadata embedded in prores stream. > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index cfaa6f196a..3c0ff2dc58 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -1195,6 +1195,7 @@ OBJS-$(CONFIG_NOISE_BSF) += noise_bsf.o > OBJS-$(CONFIG_NULL_BSF) += null_bsf.o > OBJS-$(CONFIG_OPUS_METADATA_BSF) += opus_metadata_bsf.o > OBJS-$(CONFIG_PCM_RECHUNK_BSF) += pcm_rechunk_bsf.o > +OBJS-$(CONFIG_PGS_FRAME_MERGE_BSF) += pgs_frame_merge_bsf.o > OBJS-$(CONFIG_PRORES_METADATA_BSF) += prores_metadata_bsf.o > OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o av1_parse.o > OBJS-$(CONFIG_SETTS_BSF) += setts_bsf.o > diff --git a/libavcodec/bitstream_filters.c b/libavcodec/bitstream_filters.c > index f117bc0e17..444423ae93 100644 > --- a/libavcodec/bitstream_filters.c > +++ b/libavcodec/bitstream_filters.c > @@ -52,6 +52,7 @@ extern const FFBitStreamFilter ff_noise_bsf; > extern const FFBitStreamFilter ff_null_bsf; > extern const FFBitStreamFilter ff_opus_metadata_bsf; > extern const FFBitStreamFilter ff_pcm_rechunk_bsf; > +extern const FFBitStreamFilter ff_pgs_frame_merge_bsf; > extern const FFBitStreamFilter ff_prores_metadata_bsf; > extern const FFBitStreamFilter ff_remove_extradata_bsf; > extern const FFBitStreamFilter ff_setts_bsf; > diff --git a/libavcodec/pgs_frame_merge_bsf.c b/libavcodec/pgs_frame_merge_bsf.c > new file mode 100644 > index 0000000000..bcd8945335 > --- /dev/null > +++ b/libavcodec/pgs_frame_merge_bsf.c > @@ -0,0 +1,191 @@ > +/* > + * Copyright (c) 2020 John Stebbins > + * > + * This file is part of FFmpeg. > + * > + * FFmpeg is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * FFmpeg is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with FFmpeg; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > + */ > + > +/** > + * @file > + * This bitstream filter merges PGS subtitle packets containing incomplete > + * set of segments into a single packet > + * > + * Packets already containing a complete set of segments will be passed through > + * unchanged. > + */ > + > +#include "libavutil/attributes.h" > +#include "libavutil/intreadwrite.h" > +#include "libavutil/log.h" > +#include "bsf.h" > +#include "bsf_internal.h" > + > +enum PGSSegmentType { > + PALETTE_SEGMENT = 0x14, > + OBJECT_SEGMENT = 0x15, > + PRESENTATION_SEGMENT = 0x16, > + WINDOW_SEGMENT = 0x17, > + END_DISPLAY_SET_SEGMENT = 0x80, > +}; > + > +typedef struct PGSMergeContext { > + AVPacket *buffer_pkt, *in; > + int presentation_found; > + int pkt_flags; > +} PGSMergeContext; > + > +static av_cold void frame_merge_flush(AVBSFContext *bsf) > +{ > + PGSMergeContext *ctx = bsf->priv_data; > + > + ctx->presentation_found = ctx->pkt_flags = 0; > + av_packet_unref(ctx->in); > + av_packet_unref(ctx->buffer_pkt); > +} > + > +static int frame_merge_output(PGSMergeContext *ctx, AVPacket *dst, AVPacket *src) > +{ > + if (!ctx->presentation_found) > + ctx->pkt_flags |= AV_PKT_FLAG_CORRUPT; > + ctx->presentation_found = 0; > + src->flags |= ctx->pkt_flags; > + ctx->pkt_flags = 0; > + av_packet_move_ref(dst, src); > + return 0; > +} > + > +static int frame_merge_filter(AVBSFContext *bsf, AVPacket *out) > +{ > + PGSMergeContext *ctx = bsf->priv_data; > + AVPacket *in = ctx->in, *pkt = ctx->buffer_pkt; > + int ret, size, pos, display = 0, presentation = 0; > + unsigned int i; > + > + if (!in->data) { > + ret = ff_bsf_get_packet_ref(bsf, in); > + if (ret == AVERROR_EOF && pkt->data) { > + // Output remaining data > + ctx->pkt_flags |= AV_PKT_FLAG_CORRUPT; > + return frame_merge_output(ctx, out, pkt); > + } > + if (ret < 0) > + return ret; > + } > + if (!in->size) { > + av_packet_unref(in); > + return AVERROR(EAGAIN); > + } > + in->flags &= ~AV_PKT_FLAG_KEY; // Will be detected in the stream > + > + // Validate packet data and find display_end segment > + size = in->size; > + i = 0; > + while (i + 3 <= in->size) { > + uint8_t segment_type = in->data[i]; > + int segment_len = AV_RB16(in->data + i + 1) + 3; > + > + if (i + segment_len > in->size) > + break; // Invalid, segments can't span packets > + if (segment_type == PRESENTATION_SEGMENT && ctx->presentation_found) > + break; // Invalid, there can be only one > + if (segment_type == PRESENTATION_SEGMENT) { > + uint8_t state; > + if (segment_len < 11) > + break; // Invalid presentation segment length > + ctx->presentation_found = presentation = 1; > + state = in->data[i + 10] & 0xc0; > + if (state) > + ctx->pkt_flags |= AV_PKT_FLAG_KEY; > + else > + ctx->pkt_flags &= ~AV_PKT_FLAG_KEY; > + } > + i += segment_len; > + if (segment_type == END_DISPLAY_SET_SEGMENT) { > + size = i; > + display = 1; > + break; > + } > + } > + if (display && pkt->size == 0 && size == in->size) // passthrough > + return frame_merge_output(ctx, out, in); > + if (!display && i != in->size) { > + av_log(bsf, AV_LOG_WARNING, "Failed to parse PGS segments.\n"); > + // force output what we have > + size = in->size; > + display = 1; > + ctx->pkt_flags |= AV_PKT_FLAG_CORRUPT; > + } > + > + if (presentation) { > + ret = av_packet_copy_props(pkt, in); > + if (ret < 0) > + goto fail; > + } > + pos = pkt->size; > + ret = av_grow_packet(pkt, size); > + if (ret < 0) > + goto fail; > + memcpy(pkt->data + pos, in->data, size); > + > + if (size == in->size) > + av_packet_unref(in); > + else { > + in->data += size; > + in->size -= size; > + } > + > + if (display) > + return frame_merge_output(ctx, out, pkt); > + return AVERROR(EAGAIN); > + > +fail: > + frame_merge_flush(bsf); > + return ret; > +} > + > +static av_cold int frame_merge_init(AVBSFContext *bsf) > +{ > + PGSMergeContext *ctx = bsf->priv_data; > + > + ctx->in = av_packet_alloc(); > + ctx->buffer_pkt = av_packet_alloc(); > + if (!ctx->in || !ctx->buffer_pkt) > + return AVERROR(ENOMEM); > + > + return 0; > +} > + > +static av_cold void frame_merge_close(AVBSFContext *bsf) > +{ > + PGSMergeContext *ctx = bsf->priv_data; > + > + av_packet_free(&ctx->in); > + av_packet_free(&ctx->buffer_pkt); > +} > + > +static const enum AVCodecID frame_merge_codec_ids[] = { > + AV_CODEC_ID_HDMV_PGS_SUBTITLE, AV_CODEC_ID_NONE, > +}; > + > +const FFBitStreamFilter ff_pgs_frame_merge_bsf = { > + .p.name = "pgs_frame_merge", > + .p.codec_ids = frame_merge_codec_ids, > + .priv_data_size = sizeof(PGSMergeContext), > + .init = frame_merge_init, > + .flush = frame_merge_flush, > + .close = frame_merge_close, > + .filter = frame_merge_filter, > +}; > diff --git a/libavcodec/version.h b/libavcodec/version.h > index 735c8b813c..87b7284a95 100644 > --- a/libavcodec/version.h > +++ b/libavcodec/version.h > @@ -29,7 +29,7 @@ > > #include "version_major.h" > > -#define LIBAVCODEC_VERSION_MINOR 27 > +#define LIBAVCODEC_VERSION_MINOR 28 > #define LIBAVCODEC_VERSION_MICRO 100 > > #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ Will apply this patchset tomorrow unless there are objections. - 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".