[FFmpeg-cvslog] Merge commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 21 15:34:57 2013 +0100| [db23d5de27187dd8f2ec5c6dfd98a8a363b0fda5] | committer: Michael Niedermayer

Merge commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0'

* commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0':
  wmv2: move IDCT to its own DSP context.

Conflicts:
	libavcodec/dsputil.h
	tests/ref/seek/vsynth2-wmv2
	tests/ref/vsynth/vsynth1-wmv2
	tests/ref/vsynth/vsynth2-wmv2

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

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