[FFmpeg-cvslog] Merge commit '7716dd9fbbcea2700a100c995df967d5547c2eb9'
Michael Niedermayer
git at videolan.org
Fri Jan 31 15:24:50 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 31 15:16:44 2014 +0100| [3f9e2aad34513597a2265478e8eb6c0c8a2eba6c] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3f9e2aad34513597a2265478e8eb6c0c8a2eba6c
---
More information about the ffmpeg-cvslog
mailing list