mirror of https://git.ffmpeg.org/ffmpeg.git
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: 6c9b82b6a0
, and related commits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
3f9e2aad34