Merge commit '619e0da19119bcd683f135fe9a164f37c0ca70d1'

* commit '619e0da19119bcd683f135fe9a164f37c0ca70d1': dsputil: Remove unused 32-bit functions Conflicts: libavcodec/dsputil.c libavcodec/dsputil_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · f6dcd844ee
parent c3624cfe76 619e0da191
commit f6dcd844ee
1 changed files with 0 additions and 3 deletions
--- a/libavcodec/dsputil_template.c
+++ b/libavcodec/dsputil_template.c
@ -87,9 +87,6 @@ static void FUNCC(clear_block)(int16_t *block)
    memset(block, 0, sizeof(int16_t)*64);
 }

-/**
- * memset(blocks, 0, sizeof(int16_t)*6*64)
- */
 static void FUNCC(clear_blocks)(int16_t *blocks)
 {
    memset(blocks, 0, sizeof(int16_t)*6*64);