diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 18:15:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 18:15:29 +0100 |
| commit | 1e7a92f219a8e245128773491346d64c1e6c85fa (patch) | |
| tree | 45b9df7bd1bab1b34920165d20802068d3f37bf1 /libavcodec/dsputil.c | |
| parent | f900fd5d31dcabc138a0f96511ddbf8e9a279765 (diff) | |
| parent | baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76 (diff) | |
| download | ffmpeg-1e7a92f219a8e245128773491346d64c1e6c85fa.tar.gz | |
Merge commit 'baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76'
* commit 'baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76':
dsputil: remove one array dimension from avg_no_rnd_pixels_tab.
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index cc53f5b4a6..90d33111ba 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2885,7 +2885,7 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) hpel_funcs(avg, [1], 8); hpel_funcs(avg, [2], 4); hpel_funcs(avg, [3], 2); - hpel_funcs(avg_no_rnd,[0], 16); + hpel_funcs(avg_no_rnd,, 16); #undef FUNC #undef FUNCC |