diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-31 15:16:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-31 15:18:44 +0100 |
| commit | 3f9e2aad34513597a2265478e8eb6c0c8a2eba6c (patch) | |
| tree | deb074ea989cfa23cdc436059dd7dce32dfdb506 | |
| parent | e53ec2fe3829af4a76b61cd369d8a80da74b93ff (diff) | |
| parent | 7716dd9fbbcea2700a100c995df967d5547c2eb9 (diff) | |
Merge commit '7716dd9fbbcea2700a100c995df967d5547c2eb9'
* commit '7716dd9fbbcea2700a100c995df967d5547c2eb9':
xvid: switch to xvid mmx idct as soon as possible
Conflicts:
libavcodec/mpeg4videodec.c
Not merged, as the bug was not merged either
See: 6c9b82b6a0d5cbdf90dcbf9f4e1c77ae82c5698f, and related commits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions