mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
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>
This commit is contained in:
commit
f6dcd844ee
@ -87,9 +87,6 @@ static void FUNCC(clear_block)(int16_t *block)
|
|||||||
memset(block, 0, sizeof(int16_t)*64);
|
memset(block, 0, sizeof(int16_t)*64);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* memset(blocks, 0, sizeof(int16_t)*6*64)
|
|
||||||
*/
|
|
||||||
static void FUNCC(clear_blocks)(int16_t *blocks)
|
static void FUNCC(clear_blocks)(int16_t *blocks)
|
||||||
{
|
{
|
||||||
memset(blocks, 0, sizeof(int16_t)*6*64);
|
memset(blocks, 0, sizeof(int16_t)*6*64);
|
||||||
|
Loading…
Reference in New Issue
Block a user