diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 17:58:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 17:58:46 +0100 |
| commit | 70270f27538f7f6a5e1e5b199b1bbee5972632f4 (patch) | |
| tree | 570f1ddf9af75748c4dd20bbabbe39bb3b264708 /libavcodec | |
| parent | 6d1e9d993a5559ca5c4a578fce499c74528fe8d1 (diff) | |
| parent | 2bef1a83d7a3ca60b161ab90bf4d4338e5def5e7 (diff) | |
| download | ffmpeg-70270f27538f7f6a5e1e5b199b1bbee5972632f4.tar.gz | |
Merge commit '2bef1a83d7a3ca60b161ab90bf4d4338e5def5e7'
* commit '2bef1a83d7a3ca60b161ab90bf4d4338e5def5e7':
dsputil: remove some never-assigned function pointers from the struct.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dsputil.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index b837dcc27c..8f1356eb02 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -293,7 +293,7 @@ typedef struct DSPContext { * @param line_size number of bytes in a horizontal line of block * @param h height */ - op_pixels_func put_no_rnd_pixels_tab[4][4]; + op_pixels_func put_no_rnd_pixels_tab[2][4]; /** * Halfpel motion compensation with no rounding (a+b)>>1. @@ -323,7 +323,6 @@ typedef struct DSPContext { qpel_mc_func put_qpel_pixels_tab[2][16]; qpel_mc_func avg_qpel_pixels_tab[2][16]; qpel_mc_func put_no_rnd_qpel_pixels_tab[2][16]; - qpel_mc_func avg_no_rnd_qpel_pixels_tab[2][16]; qpel_mc_func put_mspel_pixels_tab[8]; /** @@ -333,7 +332,7 @@ typedef struct DSPContext { h264_chroma_mc_func avg_h264_chroma_pixels_tab[3]; qpel_mc_func put_h264_qpel_pixels_tab[4][16]; - qpel_mc_func avg_h264_qpel_pixels_tab[4][16]; + qpel_mc_func avg_h264_qpel_pixels_tab[3][16]; me_cmp_func pix_abs[2][4]; |