Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d' | Michael Niedermayer | 2014-07-07 |
| | | | | | | | | | | | | | * 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> | ||
* | dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoenc | Diego Biurrun | 2014-07-06 |