diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-27 03:32:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-27 03:32:45 +0200 |
| commit | f211d9d8391c15e7408b8468dd7430eae2514544 (patch) | |
| tree | f432096b52ab7971a7ca7fb05db18dcc1cfcb3a5 /libswscale/swscale_internal.h | |
| parent | 721719dd0c0321b47500fa49b649c78422e910aa (diff) | |
| parent | 659aa20e56de03b461afdaa6ae7e5d4be6e0d5fc (diff) | |
| download | ffmpeg-f211d9d8391c15e7408b8468dd7430eae2514544.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: improve rules for test programs
build: factor out the .c and .S compile commands as a macro
swscale: remove unused xInc/srcW arguments from hScale().
H.264: disable 2tap qpel with CODEC_FLAG2_FAST and >8-bit
H.264: make filter_mb_fast support 4:4:4
mpeg4videoenc: Remove disabled variant of mpeg4_encode_block().
configure: allow post-fixed cpu strings for athlon64, k8, and opteron when setting the -march flag.
Move some variable declarations below the proper #ifdefs.
Conflicts:
Makefile
ffplay.c
libswscale/swscale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale_internal.h')
| -rw-r--r-- | libswscale/swscale_internal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index c0f8e64d70..27de6b24d0 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -312,8 +312,8 @@ typedef struct SwsContext { const uint8_t *src1, const uint8_t *src2, int srcW, int xInc); - void (*hScale)(int16_t *dst, int dstW, const uint8_t *src, int srcW, - int xInc, const int16_t *filter, const int16_t *filterPos, + void (*hScale)(int16_t *dst, int dstW, const uint8_t *src, + const int16_t *filter, const int16_t *filterPos, int filterSize); void (*hScale16)(int16_t *dst, int dstW, const uint16_t *src, int srcW, |