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>

1 files changed, 34 insertions, 0 deletions

diff --git a/libavcodec/wmv2dsp.h b/libavcodec/wmv2dsp.h
new file mode 100644
index 0000000000..242389bdeb
--- /dev/null
+++ b/libavcodec/wmv2dsp.h
@@ -0,0 +1,34 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_WMV2DSP_H
+#define AVCODEC_WMV2DSP_H
+
+#include <stdint.h>
+#include "dsputil.h"
+
+typedef struct WMV2DSPContext {
+    void (*idct_add)(uint8_t *dest, int line_size, DCTELEM *block);
+    void (*idct_put)(uint8_t *dest, int line_size, DCTELEM *block);
+
+    int idct_perm;
+} WMV2DSPContext;
+
+void ff_wmv2dsp_init(WMV2DSPContext *c);
+
+#endif /* AVCODEC_WMV2DSP_H */