[FFmpeg-cvslog] lavc: always build dnxhddata

Matthieu Bouron git at videolan.org
Sun Jul 24 23:59:07 EEST 2016


ffmpeg | branch: master | Matthieu Bouron <matthieu.bouron at stupeflix.com> | Sun Jul 24 22:26:47 2016 +0200| [2adbea4e216ce38a8bf6c72de16267c9162c174d] | committer: Matthieu Bouron

lavc: always build dnxhddata

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2adbea4e216ce38a8bf6c72de16267c9162c174d
---

 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
 OBJS-$(CONFIG_DPX_DECODER)             += dpx.o
 OBJS-$(CONFIG_DPX_ENCODER)             += dpxenc.o
 OBJS-$(CONFIG_DSD_LSBF_DECODER)        += dsddec.o dsd.o



More information about the ffmpeg-cvslog mailing list