ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Mon Jul 25 12:19:31 2016 -0300| [26cb7232c3432faa7a83d52dbff4503530f833ab] | committer: James Almer
Revert "lavc: always build dnxhddata" This reverts commit 2adbea4e216ce38a8bf6c72de16267c9162c174d. A better solution will follow in the next commit. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=26cb7232c3432faa7a83d52dbff4503530f833ab --- libavcodec/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 2564ab8..a548e02 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -32,7 +32,6 @@ OBJS = allcodecs.o \ codec_desc.o \ d3d11va.o \ dirac.o \ - dnxhddata.o \ dv_profile.o \ imgconvert.o \ jni.o \ @@ -242,8 +241,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 -OBJS-$(CONFIG_DNXHD_ENCODER) += dnxhdenc.o +OBJS-$(CONFIG_DNXHD_DECODER) += dnxhddec.o dnxhddata.o +OBJS-$(CONFIG_DNXHD_ENCODER) += dnxhdenc.o dnxhddata.o OBJS-$(CONFIG_DPX_DECODER) += dpx.o OBJS-$(CONFIG_DPX_ENCODER) += dpxenc.o OBJS-$(CONFIG_DSD_LSBF_DECODER) += dsddec.o dsd.o _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
