summaryrefslogtreecommitdiffstats
path: root/libavcodec/mpegvideodsp.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf'Michael Niedermayer2014-06-231-4/+4
| | | | | | | | | | | | | | | * commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf': dsputil: Split off global motion compensation bits into a separate context Conflicts: libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/ppc/dsputil_altivec.h libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c libavcodec/x86/dsputil_x86.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* dsputil: Split off global motion compensation bits into a separate contextDiego Biurrun2014-06-231-0/+119
OpenPOWER on IntegriCloud