]> git.sesse.net Git - ffmpeg/commitdiff
lavc: always build dnxhddata
authorMatthieu Bouron <matthieu.bouron@stupeflix.com>
Sun, 24 Jul 2016 20:26:47 +0000 (22:26 +0200)
committerMatthieu Bouron <matthieu.bouron@stupeflix.com>
Sun, 24 Jul 2016 20:57:06 +0000 (22:57 +0200)
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

index abef19e18b590e7a9bb9a634c8ddb6c8e21563b1..4fc4b0906700864fd4ce52250fbd5f121f4ab951 100644 (file)
@@ -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
 OBJS-$(CONFIG_DPX_DECODER)             += dpx.o
 OBJS-$(CONFIG_DPX_ENCODER)             += dpxenc.o
 OBJS-$(CONFIG_DSD_LSBF_DECODER)        += dsddec.o dsd.o