diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-29 04:08:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-29 05:23:12 +0200 |
| commit | bb9d5171a7352205ac9f09c970e24938fab57165 (patch) | |
| tree | 2abd874837de6e7cc0f21d1f84e13555b2eeb755 /libswscale/utils.c | |
| parent | dbe5f0172b4f123b15bc8ada82dd17b13c4bbbd7 (diff) | |
| parent | 4578435f35888c95b12a53a12cdab612ac3fef04 (diff) | |
| download | ffmpeg-bb9d5171a7352205ac9f09c970e24938fab57165.tar.gz | |
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>
Diffstat (limited to 'libswscale/utils.c')
| -rw-r--r-- | libswscale/utils.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c index 984f2c52fa..0679b020ea 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -149,12 +149,18 @@ int sws_isSupportedInput(enum PixelFormat pix_fmt) || (x)==PIX_FMT_YUVJ444P \ || isRGBinBytes(x) \ || isBGRinBytes(x) \ - || (x)==PIX_FMT_RGB565 \ - || (x)==PIX_FMT_RGB555 \ - || (x)==PIX_FMT_RGB444 \ - || (x)==PIX_FMT_BGR565 \ - || (x)==PIX_FMT_BGR555 \ - || (x)==PIX_FMT_BGR444 \ + || (x)==PIX_FMT_RGB565LE \ + || (x)==PIX_FMT_RGB565BE \ + || (x)==PIX_FMT_RGB555LE \ + || (x)==PIX_FMT_RGB555BE \ + || (x)==PIX_FMT_RGB444LE \ + || (x)==PIX_FMT_RGB444BE \ + || (x)==PIX_FMT_BGR565LE \ + || (x)==PIX_FMT_BGR565BE \ + || (x)==PIX_FMT_BGR555LE \ + || (x)==PIX_FMT_BGR555BE \ + || (x)==PIX_FMT_BGR444LE \ + || (x)==PIX_FMT_BGR444BE \ || (x)==PIX_FMT_RGB8 \ || (x)==PIX_FMT_BGR8 \ || (x)==PIX_FMT_RGB4_BYTE \ |