From patchwork Mon Aug 17 15:03:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= X-Patchwork-Id: 21692 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 7F83C44B615 for ; Mon, 17 Aug 2020 18:03:12 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6C62B68B82C; Mon, 17 Aug 2020 18:03:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from ssq0.pkh.me (lstlambert-657-1-117-164.w92-154.abo.wanadoo.fr [92.154.28.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B98B768B6F4 for ; Mon, 17 Aug 2020 18:03:05 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pkh.me; s=selector1; t=1597676584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=hPXjpEahC8+lzRz6iBiJzZ8BGXpT0xSn1s6wpdhaibY=; b=lxUBon9KsdaaVQy9QdUuwdn5WM4XUuW71NGdq5d0nfFvoJ738gwpZpYT1Sna/TQyjNZ9uQ iwAuurVReJCQHODPY/YsUPSd6PsqpuazORK1ZqaErrw8tCBSlWOPLzI5MxjGG+zYTKd3Xt uEXYx1oJ+yvjpR54PJ9aUa6PDFbglng= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id cbf59824; Mon, 17 Aug 2020 15:03:04 +0000 (UTC) From: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Aug 2020 17:03:00 +0200 Message-Id: <20200817150301.2914161-1-u@pkh.me> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/dvbsub: remove useless indirection in dvbsub_encode. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/dvbsub.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/libavcodec/dvbsub.c b/libavcodec/dvbsub.c index 5c081f2b71..7b8ef41a7e 100644 --- a/libavcodec/dvbsub.c +++ b/libavcodec/dvbsub.c @@ -268,9 +268,8 @@ static int dvb_encode_rle8(uint8_t **pq, int buf_size, return len; } -static int encode_dvb_subtitles(AVCodecContext *avctx, - uint8_t *outbuf, int buf_size, - const AVSubtitle *h) +static int dvbsub_encode(AVCodecContext *avctx, uint8_t *outbuf, int buf_size, + const AVSubtitle *h) { DVBSubtitleContext *s = avctx->priv_data; uint8_t *q, *pseg_len; @@ -509,16 +508,6 @@ static int encode_dvb_subtitles(AVCodecContext *avctx, return q - outbuf; } -static int dvbsub_encode(AVCodecContext *avctx, - unsigned char *buf, int buf_size, - const AVSubtitle *sub) -{ - int ret; - - ret = encode_dvb_subtitles(avctx, buf, buf_size, sub); - return ret; -} - AVCodec ff_dvbsub_encoder = { .name = "dvbsub", .long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"), From patchwork Mon Aug 17 15:03:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= X-Patchwork-Id: 21693 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 8DE9C44B615 for ; Mon, 17 Aug 2020 18:03:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6BA8768B81E; Mon, 17 Aug 2020 18:03:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from ssq0.pkh.me (lstlambert-657-1-117-164.w92-154.abo.wanadoo.fr [92.154.28.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F0EDB68B7FD for ; Mon, 17 Aug 2020 18:03:10 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pkh.me; s=selector1; t=1597676584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gDt4ukP5gUq/EwQRmL4FIIJb2Paf6E2nx+Ow6ehnIqk=; b=jOn5ClBfsCLoZ1W+6axxRiJcaVH4t5U8wX1Wk+sMt6vldyRcNc51eDr6oWmdmAtlEdG19S zBxiqqISTAO0UYbw20IaGyULnS+X1SF4B6jHpoo35ojqMzJmVSft++ly1Q5KDQ1zcn+gco E0pCWyap8Up7WFqYN6yO2GVIEFy6M38= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id eef38336; Mon, 17 Aug 2020 15:03:04 +0000 (UTC) From: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Aug 2020 17:03:01 +0200 Message-Id: <20200817150301.2914161-2-u@pkh.me> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817150301.2914161-1-u@pkh.me> References: <20200817150301.2914161-1-u@pkh.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/dvbsub: add "enc" suffix to encoder X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/Makefile | 2 +- libavcodec/{dvbsub.c => dvbsubenc.c} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename libavcodec/{dvbsub.c => dvbsubenc.c} (100%) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 3431ba2dca..f9c8c28d76 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -293,7 +293,7 @@ OBJS-$(CONFIG_DSICINVIDEO_DECODER) += dsicinvideo.o OBJS-$(CONFIG_DSS_SP_DECODER) += dss_sp.o OBJS-$(CONFIG_DST_DECODER) += dstdec.o dsd.o OBJS-$(CONFIG_DVBSUB_DECODER) += dvbsubdec.o -OBJS-$(CONFIG_DVBSUB_ENCODER) += dvbsub.o +OBJS-$(CONFIG_DVBSUB_ENCODER) += dvbsubenc.o OBJS-$(CONFIG_DVDSUB_DECODER) += dvdsubdec.o dvdsub.o OBJS-$(CONFIG_DVDSUB_ENCODER) += dvdsubenc.o dvdsub.o OBJS-$(CONFIG_DVAUDIO_DECODER) += dvaudiodec.o diff --git a/libavcodec/dvbsub.c b/libavcodec/dvbsubenc.c similarity index 100% rename from libavcodec/dvbsub.c rename to libavcodec/dvbsubenc.c