diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 15:27:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 15:36:58 +0200 |
| commit | 020865f557ccf06a41ecc461fd13ce6678817d04 (patch) | |
| tree | 657a0da279922b830200908b6e620be025e20b85 /libavcodec/snowenc.c | |
| parent | 462c6cdb8ed256d2063815b67ca4d14e62e25802 (diff) | |
| parent | c166148409fe8f0dbccef2fe684286a40ba1e37d (diff) | |
Merge commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d'
* commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d':
dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoenc
Conflicts:
libavcodec/dsputil.c
libavcodec/mpegvideo_enc.c
libavcodec/x86/dsputilenc.asm
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/snowenc.c')
0 files changed, 0 insertions, 0 deletions