]> git.sesse.net Git - ffmpeg/commit
Merge commit 'f89d76c10355242c39b08f253c1d1524f45ef778'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 02:14:43 +0000 (04:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 02:14:43 +0000 (04:14 +0200)
commit2aeeb3ba1f4fa54d0cd4cca672bc56dea07af133
treed6afd3f7c7dd263345e625406f50cd3620b3ef23
parent66eacd55807c4b0c257d644d2ee3156a43f6ba5b
parentf89d76c10355242c39b08f253c1d1524f45ef778
Merge commit 'f89d76c10355242c39b08f253c1d1524f45ef778'

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

Conflicts:
libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg4videodec.c