From patchwork Fri Dec 22 14:35:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: misty@brew.sh X-Patchwork-Id: 6911 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp2739808jad; Fri, 22 Dec 2017 11:50:21 -0800 (PST) X-Google-Smtp-Source: ACJfBov4z3q4AL3H6llTt9xi4jPSXyx9XHvRnTw76lWNNVu2zQ5vlPgvMAWVS1kbTo4bNuP5fwNC X-Received: by 10.223.136.183 with SMTP id f52mr16140489wrf.269.1513972221567; Fri, 22 Dec 2017 11:50:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513972221; cv=none; d=google.com; s=arc-20160816; b=aqqqft1F4sNfG7c5V+yiw5lW41GeUrb9I7uPHPC2QATxK/dxFgk+H0FTDuwTSVjaJz ho6TqfeD/DC8lIUr2Pj837GzHHtz1sl7fAm5MBCZNQxJJoNI5QuBS2uVaMSSBNdvgHev 9OS8fsufVBtVRzwjz+guQG4GlvHCWqbGPIrtTeNHXK330FPZ13ohxPpWkCPGEnRW1soB 72mWwufWUoszMxlbKoVIZ+bn/KdZzgq1C08901MEX1IFgz0/0ot+XaNPthDS65mi1E6Z 48tNyZQdVN65B6wYaMs2FCzaXElwUe5Ogqjo+iY+Nt3NnjU9tqKhd1jGf8i4cz/RXBYo OWsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=cgIYIeO+lPugyZ7oRwDCKJNzcV7ynOsYgmUZy4Hpl1M=; b=lXQv/hJxGQ+ZF58woLStbcNCHcwBzw46Y+Ly5eRxB87nJQf5zI5KmvqcClxcNpnero VH5p0q1+eUBWNBNfsYDXoOmvTUH0g9R/wQg4y02pZn+ZCmz3NcUk4v0fiYaLm8bg262g XjpDZsYecaWIPPipir+Iyu2FpLGHjnXb4+/Zx5iKpmGv/yK0hYp1703D2oO5hjkxWjdg CzWfi2vstZlNzRZ03nBpdIH6BtazjhqiPIdDEOE5uM/JcTV1KxuRMur4ofyeVlfreCBO xrwU5I3Hk83hOoorgoIbI8TM2NAs7Lvr5GEYaUfU5BJ+Ayp0dJf1JxZ9PMSfc6JR4sVt sbBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=UdMjexyJ; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e25si13687319wrg.32.2017.12.22.11.50.21; Fri, 22 Dec 2017 11:50:21 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=UdMjexyJ; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C9D8C6882AD; Fri, 22 Dec 2017 21:49:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f67.google.com (mail-pl0-f67.google.com [209.85.160.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 34C8D68060E for ; Fri, 22 Dec 2017 16:44:17 +0200 (EET) Received: by mail-pl0-f67.google.com with SMTP id bi12so13007156plb.6 for ; Fri, 22 Dec 2017 06:44:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=J7GeVPw5SvI/bnHt8zI/iE0EJBLXXmrBEaeBsX35MqI=; b=UdMjexyJrbcKPoXeU7gqJH/PjIHMZ4aahfBG2HjUYRIqbu4/TBYNEyBoAYw8JqWm6t UJcuFMtt6kjd0WBtY7iPZAFIiv9UBtRpWqTjPcwa5h1yxAvplsLf+Bm1oZC8ZKN8Aw9N p3m3m3JT8CbK1mCH7kBGrMC9k0iDk0sCznpr7vck1AfSky9EoDZ3kmIKA+b4T3PEffjp CAP2fJxdADsVkmhGRjWDF8/h4xwsUAbAF8avp2zFaWfNcwLjvwanAxuIaUz0OkiIuws7 +RcxtAw+xn0xzaTUf6UMYCsX3CAdpDJtpbx0OJKANi1jNmXHxsNEpGQiITX4Oyfqv87n lWVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=J7GeVPw5SvI/bnHt8zI/iE0EJBLXXmrBEaeBsX35MqI=; b=P9CAn0HGVfeD0jBzqwmGQ3sBVkrMmCe/K6dgElS90fq6vi2Yk//cwux5SprWorWKPn 5g4uBk4gARa/cpyK3xaPQzN8eISFWvzFEXQEMLhJoYr9oUyqSBzZoc9HzfeY6FLOG7WQ d7wEqcg/wUAPXmHwwWRnVSSA8zMq2YawssqBFJp4qTsKSarlZh7uyi4Mx5TUI4fDDw6m fp23SxYK2dYU7VqJFMARkEqZW86BkcyPKlpwQnBvqkAnT1Cg3RHMvLbTtWXDJI9rMTcw O/asfa6qVszfHDNE8GbwUoE59dEZAQPAmvAD3qiGgsYKMUGMGdzgiFSfZMLUfOAUdPck 8LkA== X-Gm-Message-State: AKGB3mI/ngCrW/CR/xfEM5l6Ri3/AYksODnHbTuEBNFa7JjJR3TXw/Bp iIfvkldf/OGTGOXMsdq/S3j4RZO2 X-Received: by 10.84.135.101 with SMTP id 92mr15040183pli.172.1513953381694; Fri, 22 Dec 2017 06:36:21 -0800 (PST) Received: from localhost.localdomain (220-253-129-240.dyn.iinet.net.au. [220.253.129.240]) by smtp.gmail.com with ESMTPSA id 73sm47522026pfr.145.2017.12.22.06.36.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 22 Dec 2017 06:36:20 -0800 (PST) From: misty@brew.sh To: ffmpeg-devel@ffmpeg.org Date: Fri, 22 Dec 2017 22:35:10 +0800 Message-Id: <20171222143512.92271-4-misty@brew.sh> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171222143512.92271-1-misty@brew.sh> References: <20171222143512.92271-1-misty@brew.sh> X-Mailman-Approved-At: Fri, 22 Dec 2017 21:49:23 +0200 Subject: [FFmpeg-devel] [PATCH 3/5] atrac3plus_parser: use libavcodec's oma 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: Misty De Meo MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Misty De Meo --- libavcodec/Makefile | 2 +- libavcodec/atrac3plus_parser.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index e0e3f1ebac..0e1c6d53ea 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -977,7 +977,7 @@ OBJS-$(CONFIG_AAC_PARSER) += aac_parser.o aac_ac3_parser.o \ mpeg4audio.o OBJS-$(CONFIG_AC3_PARSER) += ac3tab.o aac_ac3_parser.o OBJS-$(CONFIG_ADX_PARSER) += adx_parser.o adx.o -OBJS-$(CONFIG_ATRAC3P_PARSER) += atrac3plus_parser.o +OBJS-$(CONFIG_ATRAC3P_PARSER) += atrac3plus_parser.o oma.o OBJS-$(CONFIG_BMP_PARSER) += bmp_parser.o OBJS-$(CONFIG_CAVSVIDEO_PARSER) += cavs_parser.o OBJS-$(CONFIG_COOK_PARSER) += cook_parser.o diff --git a/libavcodec/atrac3plus_parser.c b/libavcodec/atrac3plus_parser.c index 01fcad4c45..11b236b0bf 100644 --- a/libavcodec/atrac3plus_parser.c +++ b/libavcodec/atrac3plus_parser.c @@ -20,7 +20,7 @@ #include "parser.h" #include "get_bits.h" -#include "libavformat/oma.h" +#include "oma.h" typedef struct Atrac3PlusParseContext { ParseContext pc;