summaryrefslogtreecommitdiff
path: root/libavcodec/x86/fpel_mmx.c
Commit message (Collapse)AuthorAge
* Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'Michael Niedermayer2013-05-04
|\ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7': silly typo fixes Conflicts: doc/protocols.texi libavcodec/aacpsy.c libavformat/utils.c tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * silly typo fixesDiego Biurrun2013-05-03
| |
* | Merge commit '932806232108872655556100011fe369125805d3'Michael Niedermayer2013-05-03
|\| | | | | | | | | | | | | | | * commit '932806232108872655556100011fe369125805d3': x86: dsputil: Move avg_pixels16_mmx() out of rnd_template.c x86: dsputil: Move avg_pixels8_mmx() out of rnd_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: dsputil: Move avg_pixels16_mmx() out of rnd_template.cDiego Biurrun2013-05-02
| | | | | | | | | | The function does not do any rounding, so there is no point in keeping it in a round template file.
| * x86: dsputil: Move avg_pixels8_mmx() out of rnd_template.cDiego Biurrun2013-05-02
| | | | | | | | | | The function is only instantiated once, so there is no point in keeping it in a template file.
* | Merge commit '9b3a04d30691e85b77e63f75f5f26a93c3a000cd'Michael Niedermayer2013-05-03
|/ | | | | | | * commit '9b3a04d30691e85b77e63f75f5f26a93c3a000cd': x86: Move duplicated put_pixels{8|16}_mmx functions into their own file Merged-by: Michael Niedermayer <michaelni@gmx.at>
* x86: Move duplicated put_pixels{8|16}_mmx functions into their own fileDiego Biurrun2013-05-02