mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-18 03:19:31 +02:00
3ba0bfe71f
* qatar/master: ulti: Fix invalid reads lavf: dealloc private options in av_write_trailer yadif: support 10bit YUV vc1: mark with ER_MB_ERROR bits overconsumption lavc: introduce ER_MB_END and ER_MB_ERROR error_resilience: use the ER_ namespace build: move inclusion of subdir.mak to main subdir loop rv34: NEON optimised 4x4 dequant rv34: move 4x4 dequant to RV34DSPContext aacdec: Use intfloat.h rather than local punning union. Conflicts: libavcodec/h264.c libavcodec/vc1dec.c libavfilter/vf_yadif.c libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 lines
177 B
Makefile
11 lines
177 B
Makefile
include $(SUBDIR)../config.mak
|
|
|
|
NAME = swresample
|
|
FFLIBS = avutil
|
|
|
|
HEADERS = swresample.h
|
|
|
|
OBJS = swresample.o audioconvert.o resample.o rematrix.o
|
|
|
|
TESTPROGS = swresample_test
|