diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-13 23:21:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-13 23:21:37 +0100 |
| commit | 3ba0bfe71fb18e955ca0110e5a65105d84932fbc (patch) | |
| tree | b308d41d170483c23c31c87d8dcb19fc169e2eb6 /libswscale/Makefile | |
| parent | 36be045ed7942e07742c3cf3d3012b1d2a9ec344 (diff) | |
| parent | a99273ebf328658c183c2d267f1c2b8bfac58bb3 (diff) | |
| download | ffmpeg-streaming-3ba0bfe71fb18e955ca0110e5a65105d84932fbc.zip ffmpeg-streaming-3ba0bfe71fb18e955ca0110e5a65105d84932fbc.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* 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>
Diffstat (limited to 'libswscale/Makefile')
| -rw-r--r-- | libswscale/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libswscale/Makefile b/libswscale/Makefile index 942545d..6f25145 100644 --- a/libswscale/Makefile +++ b/libswscale/Makefile @@ -26,5 +26,3 @@ $(SUBDIR)x86/swscale_mmx.o: CFLAGS += $(NOREDZONE_FLAGS) TESTPROGS = colorspace swscale DIRS = bfin mlib ppc sparc x86 - -include $(SRC_PATH)/subdir.mak |
