diff mbox

[FFmpeg-devel] avcodec/Makefile: Fix opus parser dependency.

Message ID CAO7y9i_FzuQFF_A+D9s-BaswOh5JE1jpeRPVLuQdFSPMcAgg9Q@mail.gmail.com
State New
Headers show

Commit Message

Jacob Trimble Dec. 8, 2017, 7:35 p.m. UTC 
On Fri, Dec 8, 2017 at 10:39 AM, Michael Niedermayer
<michael@niedermayer.cc> wrote:
> On Thu, Dec 07, 2017 at 11:30:13AM -0800, Jacob Trimble wrote:
>> The opus.c file uses variables that are defined in opustab.c.  The
>> opus parser needs to include that file to avoid linker errors when
>> not including the opus encoder/decoder.
>
> please list the symbols needed or the error message in the commmit
> message, so the reader knows about which symbols this is
>
> thx

Done

Comments

Michael Niedermayer Dec. 9, 2017, 6:44 p.m. UTC | #1 
On Fri, Dec 08, 2017 at 11:35:06AM -0800, Jacob Trimble wrote:
> On Fri, Dec 8, 2017 at 10:39 AM, Michael Niedermayer
> <michael@niedermayer.cc> wrote:
> > On Thu, Dec 07, 2017 at 11:30:13AM -0800, Jacob Trimble wrote:
> >> The opus.c file uses variables that are defined in opustab.c.  The
> >> opus parser needs to include that file to avoid linker errors when
> >> not including the opus encoder/decoder.
> >
> > please list the symbols needed or the error message in the commmit
> > message, so the reader knows about which symbols this is
> >
> > thx
> 
> Done

>  Makefile |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> dac7fd9255ebedc1e5db63bf6079aa8d1b6c9c8b  opus-parser-v2.patch
> From 8519e5192bc3dbbc5aa49204321419b6e5a8bf4b Mon Sep 17 00:00:00 2001
> From: Jacob Trimble <modmaker@google.com>
> Date: Thu, 7 Dec 2017 11:05:46 -0800
> Subject: [PATCH] avcodec/Makefile: Fix opus parser dependency.
> 
> The opus.c file uses ff_celt_freq_range and ff_celt_freq_bands which are
> defined in opustab.c.  The opus parser needs to include that file to
> avoid linker errors when not including the opus encoder/decoder.

will apply

thanks

[...]
diff mbox

Patch

From 8519e5192bc3dbbc5aa49204321419b6e5a8bf4b Mon Sep 17 00:00:00 2001
From: Jacob Trimble <modmaker@google.com>
Date: Thu, 7 Dec 2017 11:05:46 -0800
Subject: [PATCH] avcodec/Makefile: Fix opus parser dependency.

The opus.c file uses ff_celt_freq_range and ff_celt_freq_bands which are
defined in opustab.c.  The opus parser needs to include that file to
avoid linker errors when not including the opus encoder/decoder.

Signed-off-by: Jacob Trimble <modmaker@google.com>
---
 libavcodec/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index ab7893f560..ca72138c02 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -1005,7 +1005,7 @@  OBJS-$(CONFIG_PNG_PARSER)              += png_parser.o
 OBJS-$(CONFIG_MPEGAUDIO_PARSER)        += mpegaudio_parser.o
 OBJS-$(CONFIG_MPEGVIDEO_PARSER)        += mpegvideo_parser.o    \
                                           mpeg12.o mpeg12data.o
-OBJS-$(CONFIG_OPUS_PARSER)             += opus_parser.o opus.o vorbis_data.o
+OBJS-$(CONFIG_OPUS_PARSER)             += opus_parser.o opus.o opustab.o vorbis_data.o
 OBJS-$(CONFIG_PNG_PARSER)              += png_parser.o
 OBJS-$(CONFIG_PNM_PARSER)              += pnm_parser.o pnm.o
 OBJS-$(CONFIG_RV30_PARSER)             += rv34_parser.o
-- 
2.15.1.424.g9478a66081-goog