diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-20 14:20:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-20 14:25:27 +0100 |
| commit | 28245fb466d8deb401127e88f24aa82671936aee (patch) | |
| tree | 801f6dc18556ce5b7cb137a509bcce298103c3bf /libavcodec/dsputil.h | |
| parent | c62cb1112ffc32492c99aa1e94324fc6a951abe9 (diff) | |
| parent | 0e02b381b4850bbc5b8e1ce6e17447968a2ae8b5 (diff) | |
| download | ffmpeg-streaming-28245fb466d8deb401127e88f24aa82671936aee.zip ffmpeg-streaming-28245fb466d8deb401127e88f24aa82671936aee.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Remove put_no_rnd_pixels_l2 function pointer for w=16 from dsputil.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 153e3a6..3410a40 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -309,7 +309,7 @@ typedef struct DSPContext { */ op_pixels_func avg_no_rnd_pixels_tab[4][4]; - void (*put_no_rnd_pixels_l2[2])(uint8_t *block/*align width (8 or 16)*/, const uint8_t *a/*align 1*/, const uint8_t *b/*align 1*/, int line_size, int h); + void (*put_no_rnd_pixels_l2)(uint8_t *block/*align 8*/, const uint8_t *a/*align 1*/, const uint8_t *b/*align 1*/, int line_size, int h); /** * Thirdpel motion compensation with rounding (a+b+1)>>1. |
