diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-14 03:21:38 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-14 03:21:38 +0200 |
commit | c55780dcef1ba87564d8003cded7d045dce9ba34 (patch) | |
tree | f685b7150db1c7e0f5e65fb2761f3f8bd843f056 /libswscale | |
parent | ff5278d8f6203a9486c0cd63a3aecef4bc2e4f6f (diff) | |
parent | 651b276ef7ad8d89e89bfc94a4232ab6c36f3a8a (diff) | |
download | ffmpeg-c55780dcef1ba87564d8003cded7d045dce9ba34.tar.gz |
Merge remote branch 'qatar/master'
* qatar/master: (32 commits)
libopencore-amr, libvo-amrwbenc: Allow enabling DTX via private AVOptions
libopencore-amr, libvo-amrwbenc: Only check the bitrate when changed
libopencore-amr, libvo-amrwbenc: Find the closest matching bitrate
libvo-*: Fix up the long codec names
libavcodec: Mark AVCodec->priv_class const
swscale: Factorize FAST_BGR2YV12 definition.
libvo-aacenc: Only produce extradata if the global header flag is set
lavf: postpone removal of public metadata conversion API
lavc: postpone removal of request_channels
lavc: postpone removal of audioconvert and sample_fmt wrappers
lavf: postpone removal of deprecated avio functions
libopencore-amr: Cosmetics: Rewrap and align
libopencore-amr, libvo-amrbwenc: Rename variables and functions
libopencore-amr: Convert commented out debug logging into av_dlog
libopencore-amr: Remove an unused state variable
libvo-amrwbenc: Don't explicitly store bitrate modes in the bitrate table
libopencore-amr: Remove a useless local variable
libopencore-amr, libvo-amrwbenc: Make the bitrate/mode mapping array static const
libopencore-amr, libvo-amrwbenc: Return proper error codes in most places
libopencore-amr: Don't print carriage returns in log messages
...
Conflicts:
doc/developer.texi
libavcodec/avcodec.h
libavcodec/libvo-aacenc.c
libavcodec/libvo-amrwbenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
-rw-r--r-- | libswscale/rgb2rgb.c | 2 | ||||
-rw-r--r-- | libswscale/swscale.c | 2 | ||||
-rw-r--r-- | libswscale/swscale_internal.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c index 7226853db4..a5cebcfb35 100644 --- a/libswscale/rgb2rgb.c +++ b/libswscale/rgb2rgb.c @@ -30,8 +30,6 @@ #include "swscale.h" #include "swscale_internal.h" -#define FAST_BGR2YV12 // use 7-bit instead of 15-bit coefficients - void (*rgb24tobgr32)(const uint8_t *src, uint8_t *dst, long src_size); void (*rgb24tobgr16)(const uint8_t *src, uint8_t *dst, long src_size); void (*rgb24tobgr15)(const uint8_t *src, uint8_t *dst, long src_size); diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 7047bb80f4..c0e4db3b26 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -77,8 +77,6 @@ untested special converters //#undef ARCH_X86 #define DITHER1XBPP -#define FAST_BGR2YV12 // use 7 bit coefficients instead of 15 bit - #define isPacked(x) ( \ (x)==PIX_FMT_PAL8 \ || (x)==PIX_FMT_YUYV422 \ diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 6604cae67d..9c2f822fff 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -31,6 +31,8 @@ #define STR(s) AV_TOSTRING(s) //AV_STRINGIFY is too long +#define FAST_BGR2YV12 //use 7-bit instead of 15-bit coefficients + #define MAX_FILTER_SIZE 256 #if ARCH_X86 |