diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-26 20:34:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-26 20:52:52 +0200 |
| commit | 7e496e154583b5fe11ccf04b833c418b22f05ca4 (patch) | |
| tree | 51ff1dc2484ab90ede1d715d30e935ce22b1af7d /libswscale | |
| parent | 60497cb984221268ef95d2b63476f4f3379fb7e2 (diff) | |
| parent | 72ccfb3cb7a85d35cfe2c99ab53e981974e599cd (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: ppc: drop stray leftover backslash
build: Only clean the architecture subdirectory we build for.
build: drop some unnecessary dependencies from the H.264 parser
build: prettyprinting cosmetics
libavutil: Remove pointless rational test program.
libavutil: Remove broken and pointless lzo test program.
lavf doxy: expand AVStream.codec doxy.
lavf doxy: improve AVStream.time_base doxy.
lavf doxy: add some basic documentation about reading from the demuxer.
lavf doxy: document passing options to demuxers.
lavf doxy: clarify that an AVPacket contains encoded data.
mpegtsenc: allow user triggered PES packet flushing
APIchanges: mark the place where 0.7 was cut.
APIchanges: mark the place where 0.8 was cut.
APIchanges: fill in missing dates and hashes.
smacker: convert palette and header reading to bytestream2.
alac: convert extradata reading to bytestream2.
Conflicts:
doc/APIchanges
libavcodec/smacker.c
libavcodec/x86/Makefile
libavfilter/Makefile
libavutil/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libswscale/Makefile b/libswscale/Makefile index e78ec42975..1586a7a6f3 100644 --- a/libswscale/Makefile +++ b/libswscale/Makefile @@ -5,8 +5,14 @@ FFLIBS = avutil HEADERS = swscale.h -OBJS = input.o options.o output.o rgb2rgb.o swscale.o \ - swscale_unscaled.o utils.o yuv2rgb.o +OBJS = input.o \ + options.o \ + output.o \ + rgb2rgb.o \ + swscale.o \ + swscale_unscaled.o \ + utils.o \ + yuv2rgb.o \ OBJS-$(ARCH_BFIN) += bfin/internal_bfin.o \ bfin/swscale_bfin.o \ @@ -27,5 +33,3 @@ $(SUBDIR)x86/swscale_mmx.o: CFLAGS += $(NOREDZONE_FLAGS) OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o TESTPROGS = colorspace swscale - -DIRS = bfin ppc sparc x86 |