[FFmpeg-devel] [PATCH] lavc: always build dnxhddata

[James Almer]

On 7/24/2016 5:59 PM, Matthieu Bouron wrote:
> On Sun, Jul 24, 2016 at 10:53:51PM +0200, Michael Niedermayer wrote:
>> On Sun, Jul 24, 2016 at 10:40:58PM +0200, Michael Niedermayer wrote:
>>> On Sun, Jul 24, 2016 at 10:30:35PM +0200, Matthieu Bouron wrote:
>>>> From: Matthieu Bouron <matthieu.bouron at stupeflix.com>
>>>>
>>>> lavc/movenc rely on avpriv_dnxhd_parse_header_prefix declared by
>>>> dnxhddata.h since e47981dab7fb7c9499b959cb0125b7281301969a.
>>>>
>>>> Fixes a missing symbol error in lavc/movenc if the dnxhd encoder is not
>>>> enabled.
>>>> ---
>>>>  libavcodec/Makefile | 5 +++--
>>>>  1 file changed, 3 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/libavcodec/Makefile b/libavcodec/Makefile
>>>> index abef19e..4fc4b09 100644
>>>> --- a/libavcodec/Makefile
>>>> +++ b/libavcodec/Makefile
>>>> @@ -32,6 +32,7 @@ OBJS = allcodecs.o                                                      \
>>>>         codec_desc.o                                                     \
>>>>         d3d11va.o                                                        \
>>>>         dirac.o                                                          \
>>>> +       dnxhddata.o                                                      \
>>>>         dv_profile.o                                                     \
>>>>         imgconvert.o                                                     \
>>>>         jni.o                                                            \
>>>> @@ -241,8 +242,8 @@ OBJS-$(CONFIG_DIRAC_DECODER)           += diracdec.o dirac.o diracdsp.o diractab
>>>>                                            dirac_arith.o mpeg12data.o dirac_dwt.o \
>>>>                                            dirac_vlc.o
>>>>  OBJS-$(CONFIG_DFA_DECODER)             += dfa.o
>>>> -OBJS-$(CONFIG_DNXHD_DECODER)           += dnxhddec.o dnxhddata.o
>>>> -OBJS-$(CONFIG_DNXHD_ENCODER)           += dnxhdenc.o dnxhddata.o
>>>> +OBJS-$(CONFIG_DNXHD_DECODER)           += dnxhddec.o
>>>> +OBJS-$(CONFIG_DNXHD_ENCODER)           += dnxhdenc.o
>>>
>>> why dont you add dnxhddata.o to the demuxer needing it ?
>>
>> patch ok, i missed that this was a dependancy between the 2 libs
>> thought it was within a lib
> 
> Pushed. Thanks.
> 
> Matthieu

Please revert this change and instead add a 
"OBJS-$(CONFIG_MOV_MUXER) += dnxhddata.o" line to the libavformat
dependencies section.