diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 15:55:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 15:55:29 +0200 |
| commit | f6dcd844ee65b187b7b352e3740c43724175b3e1 (patch) | |
| tree | 58447edbac4f928569f73e943cfaebabd0bf3130 | |
| parent | c3624cfe7638e41891cebf08c3381036adc8a9cd (diff) | |
| parent | 619e0da19119bcd683f135fe9a164f37c0ca70d1 (diff) | |
| download | ffmpeg-f6dcd844ee65b187b7b352e3740c43724175b3e1.tar.gz | |
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>
| -rw-r--r-- | libavcodec/dsputil_template.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/dsputil_template.c b/libavcodec/dsputil_template.c index 349da7de56..96be7a6a65 100644 --- 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); |