From patchwork Sat May 9 09:15:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, Gang" X-Patchwork-Id: 19576 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 156B844B569 for ; Sat, 9 May 2020 12:15:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E728F689CDF; Sat, 9 May 2020 12:15:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EFA3C6883C8 for ; Sat, 9 May 2020 12:15:33 +0300 (EEST) Received: by mail-pf1-f182.google.com with SMTP id 18so2258075pfv.8 for ; Sat, 09 May 2020 02:15:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=fyOMKWWI3uxn75pm+7anYydtyhVIUpI1Mxl0pyFGtXk=; b=sBsfl3SRWOw+D7rXni9rpEduUxXGTVGB2vAp84EIr/pC9BRco0L1W06IKBC4dM7e9K wD9wadWc++DX8bzYqHNa4V5NAd1ngxM77BVmEY3LqwpvkTiXVWZpA+ab+9C7uOuKn7XV ouwar8SjrHUGDaKCSBIxiXu3XhW9eoChCu3zkmf2hp2jgXy0LiGSprTpdvsm/Olc19GH IfAsVkt/eYUmQQrAT7EeAI6a7bxQxHoLZyswQCqwbzQZV7MOP+OlL0i/Iw0iBDh8W36z g0HgHOc3Be4GFTfYZxzOmCeN3Ge5Mxx5QaNvh8LcN/HrYieLvR5OzLdPOnDWa4S3J9U7 kjJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=fyOMKWWI3uxn75pm+7anYydtyhVIUpI1Mxl0pyFGtXk=; b=fkKKnilgvrDcm6goSgPDzZcw5TNtqXosLy/A63zDkXX4e4JIhgATlIhrUAsdvm7x3l V5gFfhSrDQEEhK3/4u5lb9VtMPWg2eJtVBTcRNf3fEbKG6LJG+uMV3hBKV1/SqmJ19U5 e2ixV3MLZmdW6KHvmSmiwAUSpuwTU7v7VDsPmLNsr6FlSPNQJJOnYlTETzy+Vjj4HQT0 4fLeFBJjVDhrPYMShlXiUv2Yy/iBlNsRQ3VmHSJ0bMRc0QhIKHdPZbRueO5EhgARw7es P+THRMAO4GJ9y/wwdGATbqbs3ZduLXkDOo4IsyhBesjHWCIuB1WE0iAGI93fJcu+HAdk RMNw== X-Gm-Message-State: AGi0PubApvtkn98X20xX/gsflzQkM7ArJrUxNH3DAEpFjh4C1osMxvwZ kv06CajOQrMoituSEAdGrVcq/5LT3jo= X-Google-Smtp-Source: APiQypKpXCgjC4Nn5mmISGwdm9maeIQ7Q1BTTWxUgM/Z+hwCm6PU/IezeXpcP3sh9yvCgVwpxt2MLw== X-Received: by 2002:a63:d954:: with SMTP id e20mr5665522pgj.360.1589015731648; Sat, 09 May 2020 02:15:31 -0700 (PDT) Received: from localhost.localdomain ([2600:3c01::f03c:91ff:feee:c20d]) by smtp.gmail.com with ESMTPSA id 3sm4092076pfo.27.2020.05.09.02.15.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 May 2020 02:15:31 -0700 (PDT) From: "Zhao, Gang" To: Date: Sat, 9 May 2020 17:15:20 +0800 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH v2 4/4] avcodec/encode: avcodec/frame_thread_encoder: Fixed a compile warning 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Disable deprecation declarations compile warning when we really need to call these deprecated functions. Signed-off-by: Zhao, Gang --- Changes from v1: Removed unnecessary #if check libavcodec/encode.c | 2 ++ libavcodec/frame_thread_encoder.c | 2 ++ 2 files changed, 4 insertions(+) diff --git libavcodec/encode.c libavcodec/encode.c index 9ed2cf0f59..59f1254d61 100644 --- libavcodec/encode.c +++ libavcodec/encode.c @@ -368,11 +368,13 @@ static int do_encode(AVCodecContext *avctx, const AVFrame *frame, int *got_packe avctx->internal->buffer_pkt_valid = 0; if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) { +FF_DISABLE_DEPRECATION_WARNINGS ret = avcodec_encode_video2(avctx, avctx->internal->buffer_pkt, frame, got_packet); } else if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) { ret = avcodec_encode_audio2(avctx, avctx->internal->buffer_pkt, frame, got_packet); +FF_ENABLE_DEPRECATION_WARNINGS } else { ret = AVERROR(EINVAL); } diff --git libavcodec/frame_thread_encoder.c libavcodec/frame_thread_encoder.c index 949bc69f81..87e3b470e5 100644 --- libavcodec/frame_thread_encoder.c +++ libavcodec/frame_thread_encoder.c @@ -86,7 +86,9 @@ static void * attribute_align_arg worker(void *v){ pthread_mutex_unlock(&c->task_fifo_mutex); frame = task.indata; +FF_DISABLE_DEPRECATION_WARNINGS ret = avcodec_encode_video2(avctx, pkt, frame, &got_packet); +FF_ENABLE_DEPRECATION_WARNINGS pthread_mutex_lock(&c->buffer_mutex); av_frame_unref(frame); pthread_mutex_unlock(&c->buffer_mutex);