diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 00:07:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 00:07:47 +0100 |
| commit | ea2bd139b75d1bae66bcd28f43e10e4d2f93c767 (patch) | |
| tree | a249653d774cdc0630de61ffcd9be0ca6a125a11 | |
| parent | 4104eb44e629d1469918e73587649fd3b2d992ba (diff) | |
| parent | 0a8f91b1fbc1b627d8db8c734c812beb32102936 (diff) | |
| download | ffmpeg-ea2bd139b75d1bae66bcd28f43e10e4d2f93c767.tar.gz | |
Merge commit '0a8f91b1fbc1b627d8db8c734c812beb32102936'
* commit '0a8f91b1fbc1b627d8db8c734c812beb32102936':
dsputil: Remove disabled avg_no_rnd_qpel leftovers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/dsputil.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 522a6f0808..73ce57ce48 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -1321,9 +1321,8 @@ static void OPNAME ## qpel16_mc22_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride QPEL_MC(0, put_ , _ , op_put) QPEL_MC(1, put_no_rnd_, _no_rnd_, op_put_no_rnd) QPEL_MC(0, avg_ , _ , op_avg) -//QPEL_MC(1, avg_no_rnd , _ , op_avg) + #undef op_avg -#undef op_avg_no_rnd #undef op_put #undef op_put_no_rnd @@ -2718,13 +2717,11 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) dspfunc(put_no_rnd_qpel, 0, 16); dspfunc(avg_qpel, 0, 16); - /* dspfunc(avg_no_rnd_qpel, 0, 16); */ dspfunc(put_qpel, 1, 8); dspfunc(put_no_rnd_qpel, 1, 8); dspfunc(avg_qpel, 1, 8); - /* dspfunc(avg_no_rnd_qpel, 1, 8); */ #undef dspfunc |