Merge commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Jan 2013 14:34:57 +0000 (15:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Jan 2013 15:07:21 +0000 (16:07 +0100)
commitdb23d5de27187dd8f2ec5c6dfd98a8a363b0fda5
tree01b9286e8a7d1e83c4b8d734d7767a3115838561
parent2cf9ab655549cf2f25ba57ee84baa6d38530ec3b
parente6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0
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@gmx.at>
libavcodec/Makefile
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/wmv2.c
libavcodec/wmv2.h
libavcodec/wmv2dec.c
libavcodec/wmv2dsp.c
libavcodec/wmv2dsp.h
tests/ref/seek/vsynth2-wmv2
tests/ref/vsynth/vsynth1-wmv2
tests/ref/vsynth/vsynth2-wmv2