diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-30 01:23:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-30 01:29:11 +0200 |
| commit | 5a35cef4b102ba99c31f83db8092b4d36383b044 (patch) | |
| tree | 13bf45700873c38b3824eb917118d4bda450453d /libswscale/rgb2rgb_template.c | |
| parent | adba9c63525b8971fc6ccda47e643dca05c3ee9d (diff) | |
| parent | 371266daa3df35c424203fff0ce2e6de0e33a29d (diff) | |
| download | ffmpeg-5a35cef4b102ba99c31f83db8092b4d36383b044.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ARM: enable UAL syntax in asm.S
v4l2: don't leak video standard string on error.
swscale: Remove disabled code.
avfilter: Surround function only used in debug mode by appropriate #ifdef.
vf_crop: Replace #ifdef DEBUG + av_log() by av_dlog().
build: remove BUILD_ROOT variable
vp8: use av_clip_uintp2() where possible
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/rgb2rgb_template.c')
| -rw-r--r-- | libswscale/rgb2rgb_template.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libswscale/rgb2rgb_template.c b/libswscale/rgb2rgb_template.c index beb7c34e0c..0734e8891b 100644 --- a/libswscale/rgb2rgb_template.c +++ b/libswscale/rgb2rgb_template.c @@ -574,7 +574,6 @@ static inline void planar2x_c(const uint8_t *src, uint8_t *dst, int srcWidth, } // last line -#if 1 dst[0]= src[0]; for (x=0; x<srcWidth-1; x++) { @@ -582,12 +581,6 @@ static inline void planar2x_c(const uint8_t *src, uint8_t *dst, int srcWidth, dst[2*x+2]= ( src[x] + 3*src[x+1])>>2; } dst[2*srcWidth-1]= src[srcWidth-1]; -#else - for (x=0; x<srcWidth; x++) { - dst[2*x+0]= - dst[2*x+1]= src[x]; - } -#endif } /** |