From patchwork Wed Dec 19 16:03:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Helmut K. C. Tessarek" X-Patchwork-Id: 11473 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 DC3E944EB24 for ; Wed, 19 Dec 2018 18:03:41 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 07A4468AC03; Wed, 19 Dec 2018 18:03:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from atvie01s.evermeet.cx (evermeet.cx [77.244.245.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 44C5A68A8DA for ; Wed, 19 Dec 2018 18:03:36 +0200 (EET) Received: from catormac041.att.com ([194.106.246.136]) (authenticated bits=0) by atvie01s.evermeet.cx (8.15.2/8.15.2) with ESMTPSA id wBJG3b7t028202 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Wed, 19 Dec 2018 17:03:37 +0100 DKIM-Filter: OpenDKIM Filter v2.10.3 atvie01s.evermeet.cx wBJG3b7t028202 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=evermeet.cx; s=default; t=1545235418; bh=5seUba6Bx0Ij7qQD7VmtqUMWm+bAwiiZGo/d8e2xQ8w=; h=From:To:Subject:Date:From; b=dCXFCL/VNS9718G7HlR3qI+1TuhWFe6gGg9H3DCZdHAfQfvy97bAU7Bue970m7T+L WK64e8DcOjuHu41F3E+/s8i4Nf0HN8hy5N067yxBIqD4LdLfMFeo9IqfhYA8vsrN+a Qp0EcKkD+5G6+jQHhNxghPoOccYFeqJrPr9fFvkw= From: "Helmut K. C. Tessarek" To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Dec 2018 17:03:37 +0100 Message-Id: <20181219160337.59272-1-tessarek@evermeet.cx> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavcodec/libaomenc: fix breakage from upstream 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" commit https://aomedia.googlesource.com/aom/+/4667aa1a373566e9c124afcd58c71731ab0d7377 changed parts of the code that broke compilation of libavcodec/libaomenc.c --- libavcodec/libaomenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 09ef423ce1..6d1955f9cc 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -195,7 +195,7 @@ static av_cold void free_frame_list(struct FrameListData *list) } static av_cold int codecctl_int(AVCodecContext *avctx, - enum aome_enc_control_id id, int val) + aome_enc_control_id id, int val) { AOMContext *ctx = avctx->priv_data; char buf[80]; @@ -291,7 +291,7 @@ static int set_pix_fmt(AVCodecContext *avctx, aom_codec_caps_t codec_caps, static void set_color_range(AVCodecContext *avctx) { - enum aom_color_range aom_cr; + aom_color_range_t aom_cr; switch (avctx->color_range) { case AVCOL_RANGE_UNSPECIFIED: case AVCOL_RANGE_MPEG: aom_cr = AOM_CR_STUDIO_RANGE; break;