[FFmpeg-cvslog] Merge commit 'f89d76c10355242c39b08f253c1d1524f45ef778'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug  4 04:14:43 2014 +0200| [2aeeb3ba1f4fa54d0cd4cca672bc56dea07af133] | committer: Michael Niedermayer

Merge commit 'f89d76c10355242c39b08f253c1d1524f45ef778'

* commit 'f89d76c10355242c39b08f253c1d1524f45ef778':
  mpeg4video: Initialize xvididct for all threads

Conflicts:
	libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2aeeb3ba1f4fa54d0cd4cca672bc56dea07af133
---