summaryrefslogtreecommitdiff
path: root/libavcodec/wmv2.h
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2013-01-20 22:12:35 -0800
committerRonald S. Bultje <rsbultje@gmail.com>2013-01-20 22:12:35 -0800
commite6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0 (patch)
tree372ff5d7a56c1ea732d01ee4051293bf0309162b /libavcodec/wmv2.h
parent8a4f26206d7914eaf2903954ce97cb7686933382 (diff)
wmv2: move IDCT to its own DSP context.
This allows us to remove FF_IDCT_WMV2, which serves no practical purpose other than to be able to select the WMV2 IDCT for MPEG (or vice versa) and get corrupt output. Fate tests for all wmv2-related tests change, because (for some obscure reason) they forced use of the MPEG IDCT. You would get the same changes previously by not using -idct simple in the fate test (or replacing it with -idct auto).
Diffstat (limited to 'libavcodec/wmv2.h')
-rw-r--r--libavcodec/wmv2.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/wmv2.h b/libavcodec/wmv2.h
index 80f36ccddb..82075670e0 100644
--- a/libavcodec/wmv2.h
+++ b/libavcodec/wmv2.h
@@ -25,6 +25,7 @@
#include "dsputil.h"
#include "mpegvideo.h"
#include "intrax8.h"
+#include "wmv2dsp.h"
#define SKIP_TYPE_NONE 0
#define SKIP_TYPE_MPEG 1
@@ -35,6 +36,7 @@
typedef struct Wmv2Context{
MpegEncContext s;
IntraX8Context x8;
+ WMV2DSPContext wdsp;
int j_type_bit;
int j_type;
int abt_flag;