diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-22 14:54:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-22 15:33:23 +0100 |
| commit | 26345acb0e723d28aa28e09126ea383b2f679f5b (patch) | |
| tree | f8d7a9f62d7557aca5ad56dd244fa415fdab56f2 /libavcodec/dsputil.h | |
| parent | 9774251c45eadfe0ba7b0381344451fa8840cc0d (diff) | |
| parent | 0881cbf314982cce8448bd12644ce2a6e0b8c576 (diff) | |
| download | ffmpeg-streaming-26345acb0e723d28aa28e09126ea383b2f679f5b.zip ffmpeg-streaming-26345acb0e723d28aa28e09126ea383b2f679f5b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
proresdec: support mixed interlaced/non-interlaced content
vp3/5: move put_no_rnd_pixels_l2 from dsputil to VP3DSPContext.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 5bac9df..8c52e51 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -308,8 +308,6 @@ typedef struct DSPContext { */ op_pixels_func avg_no_rnd_pixels_tab[4][4]; - 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. * this is an array[12] of motion compensation functions for the 9 thirdpe |
