2015-12-06 08:51:46 +00:00
|
|
|
$OpenBSD: patch-libavcodec_Makefile,v 1.22 2015/12/06 08:51:46 ajacoutot Exp $
|
2015-10-17 06:49:22 +00:00
|
|
|
|
|
|
|
|
aacenc: add support for encoding files using Long Term Prediction
|
|
|
|
|
|
2015-12-06 08:51:46 +00:00
|
|
|
avcodec/aac_tablegen: get rid of hardcoded tables entirely
|
|
|
|
|
|
|
|
|
|
--- libavcodec/Makefile.orig Thu Nov 12 02:08:28 2015
|
|
|
|
|
+++ libavcodec/Makefile Sun Nov 29 18:42:51 2015
|
2015-10-17 06:49:22 +00:00
|
|
|
@@ -134,6 +134,7 @@ OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aac
|
|
|
|
|
aacpsy.o aactab.o \
|
|
|
|
|
aacenc_is.o \
|
|
|
|
|
aacenc_tns.o \
|
|
|
|
|
+ aacenc_ltp.o \
|
|
|
|
|
aacenc_pred.o \
|
|
|
|
|
psymodel.o mpeg4audio.o kbdwin.o
|
|
|
|
|
OBJS-$(CONFIG_AASC_DECODER) += aasc.o msrledec.o
|
2015-12-06 08:51:46 +00:00
|
|
|
@@ -907,7 +908,6 @@ SLIBOBJS-$(HAVE_GNU_WINDRES) += avcodecres.o
|
|
|
|
|
|
|
|
|
|
SKIPHEADERS += %_tablegen.h \
|
|
|
|
|
%_tables.h \
|
|
|
|
|
- aac_tablegen_decl.h \
|
|
|
|
|
fft-internal.h \
|
|
|
|
|
old_codec_ids.h \
|
|
|
|
|
tableprint.h \
|
|
|
|
|
@@ -947,8 +947,7 @@ TESTOBJS = dctref.o
|
|
|
|
|
|
|
|
|
|
TOOLS = fourcc2pixfmt
|
|
|
|
|
|
|
|
|
|
-HOSTPROGS = aac_tablegen \
|
|
|
|
|
- aacps_tablegen \
|
|
|
|
|
+HOSTPROGS = aacps_tablegen \
|
|
|
|
|
aacps_fixed_tablegen \
|
|
|
|
|
aacsbr_tablegen \
|
|
|
|
|
aacsbr_fixed_tablegen \
|
|
|
|
|
@@ -983,7 +982,7 @@ $(SUBDIR)%_tablegen$(HOSTEXESUF): HOSTCFLAGS += -DCONF
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
GEN_HEADERS = cabac_tables.h cbrt_tables.h cbrt_fixed_tables.h aacps_tables.h aacps_fixed_tables.h aacsbr_tables.h \
|
|
|
|
|
- aacsbr_fixed_tables.h aac_tables.h dsd_tables.h dv_tables.h \
|
|
|
|
|
+ aacsbr_fixed_tables.h dsd_tables.h dv_tables.h \
|
|
|
|
|
sinewin_tables.h sinewin_fixed_tables.h mpegaudio_tables.h motionpixels_tables.h \
|
|
|
|
|
pcm_tables.h qdm2_tables.h
|
|
|
|
|
GEN_HEADERS := $(addprefix $(SUBDIR), $(GEN_HEADERS))
|
|
|
|
|
@@ -998,7 +997,6 @@ $(SUBDIR)aacps_float.o: $(SUBDIR)aacps_tables.h
|
|
|
|
|
$(SUBDIR)aacps_fixed.o: $(SUBDIR)aacps_fixed_tables.h
|
|
|
|
|
$(SUBDIR)aacsbr.o: $(SUBDIR)aacsbr_tables.h
|
|
|
|
|
$(SUBDIR)aacsbr_fixed.o: $(SUBDIR)aacsbr_fixed_tables.h
|
|
|
|
|
-$(SUBDIR)aactab.o: $(SUBDIR)aac_tables.h
|
|
|
|
|
$(SUBDIR)aactab_fixed.o: $(SUBDIR)aac_fixed_tables.h
|
|
|
|
|
$(SUBDIR)cabac.o: $(SUBDIR)cabac_tables.h
|
|
|
|
|
$(SUBDIR)dsddec.o: $(SUBDIR)dsd_tables.h
|
