diff options
| author | James Almer <jamrial@gmail.com> | 2016-07-25 12:19:31 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-07-25 12:19:31 -0300 |
| commit | 26cb7232c3432faa7a83d52dbff4503530f833ab (patch) | |
| tree | 3c4a05acb6b89200947c5e5eb218a7970d8f8737 /libavcodec | |
| parent | 71167f7f8434341b3f76da68a10923b6525e2e87 (diff) | |
| download | ffmpeg-26cb7232c3432faa7a83d52dbff4503530f833ab.tar.gz | |
Revert "lavc: always build dnxhddata"
This reverts commit 2adbea4e216ce38a8bf6c72de16267c9162c174d.
A better solution will follow in the next commit.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 2564ab8be6..a548e02597 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 |