Michael Niedermayer
bb9d5171a7
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (21 commits)
swscale: Add Doxygen for hyscale_fast/hScale.
fate: enable lavfi-pixmt tests on big endian systems
PPC: swscale: disable altivec functions for unsupported formats
fate: merge identical pixdesc_be/le tests
swscale: Add Doxygen for yuv2planar*/yuv2packed* functions.
build: call texi2pod.pl with full path instead of symlink
build: include sub-makefiles using full path instead of symlinks
swscale: update big endian reference values after dff5a835
.
wavpack: skip blocks with no samples
cosmetics: remove outdated comment that is no longer true
build: replace some addprefix/addsuffix with substitution refs
avutil: Remove unused arbitrary precision integer code.
configure: Drop check for availability of ten assembler operands.
aacenc: Save channel configuration for later use.
aacenc: Fix codebook trellising for zeroed bands.
swscale: change prototypes of scaled YUV output functions.
swscale: re-add support for non-native endianness.
swscale: disentangle yuv2rgbX_c_full() into small functions.
swscale: split yuv2packed[12X]_c() remainders into small functions.
swscale: split yuv2packedX_altivec in smaller functions.
...
Conflicts:
Makefile
configure
libavcodec/x86/dsputil_mmx.c
libavfilter/Makefile
libavformat/Makefile
libavutil/integer.c
libavutil/integer.h
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/x86/swscale_template.c
tests/ref/lavfi/pixdesc_le
tests/ref/lavfi/pixfmts_scale
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-29 05:23:12 +02:00
Mans Rullgard
57b4a3dd2b
build: include sub-makefiles using full path instead of symlinks
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-28 18:15:19 +01:00
Reimar Döffinger
1109680434
Revert "build: Remove redundant config.mak includes from subdirectory Makefiles."
...
This reverts commit a6213f3dce
.
2011-06-26 09:49:36 +02:00
Diego Biurrun
a6213f3dce
build: Remove redundant config.mak includes from subdirectory Makefiles.
...
Calling Make from subdirectories is not supported and config.mak has
multiple inclusion guards anyway, so the top-level include is enough.
2011-06-25 13:02:51 +02:00
Ronald S. Bultje
6af2801088
swscale: split swscale.c in unscaled and generic conversion routines.
...
This duplicates the function fillPlane().
2011-06-03 09:52:09 -07:00
Ronald S. Bultje
983260b0a4
swscale: split out x86/swscale_template.c from swscale.c.
2011-06-03 09:52:09 -07:00
Ronald S. Bultje
67d80a5421
swscale: split out ppc _template.c files from main swscale.c.
2011-06-03 09:52:09 -07:00
Ronald S. Bultje
0e5d31b16b
swscale: split out unscaled altivec YUV converters in their own file.
2011-06-03 09:52:09 -07:00
Luca Barbato
c003832883
swscale: move away x86 specific code from rgb2rgb
...
Keep only the plain C code in the main rgb2rgb.c and move the x86
specific optimizations to x86/rgb2rgb.c
Change the initialization pattern a little so some of it can be
factorized to behave more like dsputils.
2011-04-14 22:16:47 +02:00
Reinhard Tartler
737eb5976f
Merge libavcore into libavutil
...
It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody
is helped by having libavutil and libavcore split. In order to ease
maintenance inside and around FFmpeg and to reduce confusion where to
put common code, avcore's functionality is merged (back) to avutil.
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-02-15 16:18:21 +01:00
Ramiro Polla
06c93cb705
swscale-test: get strides using av_fill_image_linesizes() from libavcore
...
Originally committed as revision 31948 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-08-08 18:14:43 +00:00
Diego Biurrun
f4ea7c8911
alternative LGPL-licensed, MMX-optimized YUV to RGB conversion routines
...
written by Kostya Shishkov
Originally committed as revision 31135 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-05-04 09:11:01 +00:00
Stefano Sabatini
b51de6d8c7
Rename swscale-example to swscale-test, to better reflect the intended
...
use of the program.
Originally committed as revision 30439 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-27 00:25:23 +00:00
Ramiro Polla
a4388ebd37
Split swscale.c into scaler code (swscale.c) and utility code (utils.c).
...
Originally committed as revision 30411 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-24 02:08:22 +00:00
Stefano Sabatini
a208350c3c
Rename swscale_avoption.c to options.c.
...
Consistent with lavc and lavf.
Originally committed as revision 29188 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-04-18 13:52:00 +00:00
Diego Biurrun
cc3a248603
Move addition of MMX-OBJS to OBJS into common.mak instead of duplicating it.
...
Originally committed as revision 29175 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-04-12 22:49:58 +00:00
Måns Rullgård
99cc563f26
Make examples and test progs depend on libraries
...
Originally committed as revision 29119 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-04-01 00:54:23 +00:00
Diego Biurrun
e7f98e4e94
Add missing $(EXESUF) to example/test program dependency declaration.
...
Originally committed as revision 29114 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-03-31 16:52:24 +00:00
Diego Biurrun
4b086e7f21
Generalize example target rule in common.mak so that it sets a -example$(EXESUF)
...
suffix for all example files instead of doing this in individual Makefiles.
Originally committed as revision 29100 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-03-29 14:35:38 +00:00
Ramiro Polla
d5e9bc0636
Move bfin specific code to its subdir.
...
Originally committed as revision 29079 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-03-27 22:56:56 +00:00
Diego Biurrun
66e6aec589
Rename cs_test.c --> colorspace-test.c. This is more consistent with the names
...
of other test programs and more descriptive of what the program does.
Originally committed as revision 29067 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-03-26 14:20:15 +00:00
Ramiro Polla
befa8e665c
Move yuv2rgb code to subdirs.
...
Originally committed as revision 29063 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-03-26 01:30:10 +00:00
Diego Biurrun
e43f34bd44
swscale-example is an API example, not a test program.
...
Originally committed as revision 29056 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-03-25 18:08:52 +00:00
Diego Biurrun
9e12268c57
Rename 'tests' target to 'testprogs'. It is too easily confused with the
...
'test' target and a directory named tests exists.
Originally committed as revision 29039 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-03-22 23:15:54 +00:00
Diego Biurrun
f1c5438fbb
Remove unnecessary CLEANFILES declaration. Test programs do not require it.
...
Originally committed as revision 29038 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-03-22 23:09:20 +00:00
Diego Biurrun
1e5304c69e
Rename yuv2rgb2.c --> yuv2rgb.c.
...
Originally committed as revision 28723 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-02-24 22:40:20 +00:00
Kostya Shishkov
e76709d8a6
New LGPLed YUV2RGB table generator for SwScaler
...
Originally committed as revision 28700 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-02-22 09:22:05 +00:00
Diego Biurrun
4d382e2076
cosmetics: Consistently place HEADERS before OBJS in all Makefiles.
...
Originally committed as revision 27970 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-11-20 22:54:30 +00:00
Diego Biurrun
6408c25b95
Merge ARCH_BFIN lines.
...
Originally committed as revision 27889 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-11-03 22:06:45 +00:00
Diego Biurrun
efa430faed
Add tests target for libswscale test programs.
...
Originally committed as revision 27888 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-11-03 22:01:03 +00:00
Måns Rullgård
1a220bcde3
Remove forgotten ASM_OBJS in libswscale
...
Originally committed as revision 27887 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-11-03 21:49:54 +00:00
Michael Niedermayer
bddddb5a0b
rgb2rgb.h was not really intended to be a public header, thus remove it.
...
Originally committed as revision 27836 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-10-27 09:05:27 +00:00
Luca Barbato
e40b183d3a
Split AVOption/AVClass in a separate file. SoC Patch from Keiji Costantini
...
Originally committed as revision 27244 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-07-09 22:43:08 +00:00
Diego Biurrun
b146e17df5
OBJS should end in .o, not .c.
...
Originally committed as revision 27035 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-06-08 14:44:38 +00:00
Jan Knutar
862ae1d6a2
VIS OBJS should end in .o, not .c; patch by Jan Knutar, jknutar nic fi.
...
Originally committed as revision 27034 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-06-08 14:44:05 +00:00
Diego Biurrun
8ab52e71e1
cosmetics: sort lines (correctly)
...
Originally committed as revision 26673 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-05-05 10:10:05 +00:00
Luca Barbato
e3e0d99332
Cosmetics: reorder and align targets
...
Originally committed as revision 26671 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-05-04 20:22:03 +00:00
Luca Barbato
5478959b8f
Build sparc arch specific code using the Makefile
...
Originally committed as revision 26670 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-05-04 20:19:33 +00:00
Diego Biurrun
4405c986f9
cosmetics: alphabetical order
...
Originally committed as revision 26669 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-05-04 18:28:24 +00:00
Måns Rullgård
7669899bdf
non-recursive makefiles
...
Originally committed as revision 26346 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-04-07 21:16:50 +00:00
Diego Biurrun
69ed2c3b92
cosmetics: Remove useless empty line.
...
Originally committed as revision 26201 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-03-08 14:54:36 +00:00
Diego Biurrun
2e7bd34493
cosmetics: Consistently move NAME and FFLIBS to the top of each Makefile.
...
Originally committed as revision 26200 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-03-08 14:40:18 +00:00
Måns Rullgård
6b60ac3ee5
simplify library version handling
...
Originally committed as revision 26193 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-03-07 19:27:08 +00:00
Måns Rullgård
b10b849f35
consolidate CFLAGS, LDFLAGS, EXTRALIBS assignment
...
Originally committed as revision 26186 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-03-06 20:44:47 +00:00
Diego Biurrun
2f3cbef06e
Rename LIB to LIBNAME for consistency.
...
Originally committed as revision 24802 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-10-18 09:35:02 +00:00
Diego Biurrun
035c591983
cosmetics: Sort some lines, whitespace changes.
...
Originally committed as revision 24305 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-08-30 23:11:55 +00:00
Marc Hoffman
1ebbfe159f
integrating ff_bfin_get_unscaled_swscale into the system
...
Originally committed as revision 23605 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-06-22 13:03:40 +00:00
Reimar Döffinger
a444671542
Missing libswscale part of TARGET_ -> HAVE_ change
...
Originally committed as revision 23564 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-06-16 15:29:26 +00:00
Reimar Döffinger
6e6203fb1c
Copile fix: missing libswscale part of ffmpeg r9322 TARGET_ARCH -> ARCH change.
...
Originally committed as revision 23562 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-06-16 15:17:00 +00:00
Marc Hoffman
d3f3eea92d
Blackfin optimized YUV420 to RGB CSC Color Space Converters.
...
YUV2 -> RGB BGR for 565, 555 and 888 a.k.a. 24bit color.
Speed-up compared to C version compiled with -O3 187.28%
Patch by Marc Hoffman %mmh A pleasantst P com%
Original thread:
Date: May 9, 2007 2:46 AM
Subject: [FFmpeg-devel] PATCH BlackFin yuv2rgb color space conversion
Originally committed as revision 23307 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-05-13 19:22:32 +00:00