diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 17:52:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 17:52:21 +0100 |
| commit | 6d1e9d993a5559ca5c4a578fce499c74528fe8d1 (patch) | |
| tree | e0bb88a7451876b192ef4254a6e3320ff75d260c /libavcodec/dsputil.c | |
| parent | ac8987591f5503768e7587c25693928f26fcb3d1 (diff) | |
| parent | 32ff6432284f713e9f837ee5b36fc8e9f1902836 (diff) | |
Merge commit '32ff6432284f713e9f837ee5b36fc8e9f1902836'
* commit '32ff6432284f713e9f837ee5b36fc8e9f1902836':
dsputil: remove avg_no_rnd_pixels8.
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.c')
| -rw-r--r-- | libavcodec/dsputil.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 80a85a951c..5d31d70fd9 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2925,7 +2925,6 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) dspfunc1(avg , 2, 4, depth);\ dspfunc1(avg , 3, 2, depth);\ dspfunc1(avg_no_rnd, 0, 16, depth);\ - dspfunc1(avg_no_rnd, 1, 8, depth);\ \ dspfunc2(put_h264_qpel, 0, 16, depth);\ dspfunc2(put_h264_qpel, 1, 8, depth);\ |