diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 02:41:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 02:41:18 +0100 |
| commit | d3edc65dd1e5b5d4246fcb8bcd216eb558bab7d4 (patch) | |
| tree | 82e289e25d9899e669f99fe9f739a853c217401d /libavcodec/Makefile | |
| parent | 150de78d7c9cee65b4095832b25ae353e0d7c7af (diff) | |
| parent | 0517c9e098092709397cc522c59fa63c83cc81be (diff) | |
Merge commit '0517c9e098092709397cc522c59fa63c83cc81be'
* commit '0517c9e098092709397cc522c59fa63c83cc81be':
lavc: remove disabled FF_API_AVCODEC_RESAMPLE cruft
Conflicts:
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/resample.c
libavcodec/resample2.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 2788ff0f8e..485207961b 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -27,8 +27,6 @@ OBJS = allcodecs.o \ parser.o \ raw.o \ rawdec.o \ - resample.o \ - resample2.o \ utils.o \ # parts needed for many different codecs |