diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 20:25:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 20:25:12 +0200 |
| commit | 3bb22973518cbef28504e4d5b9fd74453cc3339c (patch) | |
| tree | 06b64db5ed44740f1969da46db6dee79aa8d7bec /libavcodec/Makefile | |
| parent | c1df467d73ee8c6e792ec27c126c5f0e2bc1af9d (diff) | |
| parent | efd26bedec9a345a5960dbfcbaec888418f2d4e6 (diff) | |
Merge commit 'efd26bedec9a345a5960dbfcbaec888418f2d4e6'
* commit 'efd26bedec9a345a5960dbfcbaec888418f2d4e6':
build: Add explanatory comments to (optimization) blocks in the Makefiles
Conflicts:
libavcodec/ppc/Makefile
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 55b7b02746..8173449c21 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -32,7 +32,7 @@ OBJS = allcodecs.o \ resample2.o \ utils.o \ -# parts needed for many different codecs +# subsystems OBJS-$(CONFIG_AANDCTTABLES) += aandcttab.o OBJS-$(CONFIG_AC3DSP) += ac3dsp.o OBJS-$(CONFIG_AUDIO_FRAME_QUEUE) += audio_frame_queue.o |