diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 15:34:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 16:07:21 +0100 |
| commit | db23d5de27187dd8f2ec5c6dfd98a8a363b0fda5 (patch) | |
| tree | 01b9286e8a7d1e83c4b8d734d7767a3115838561 /libavcodec/wmv2.h | |
| parent | 2cf9ab655549cf2f25ba57ee84baa6d38530ec3b (diff) | |
| parent | e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0 (diff) | |
| download | ffmpeg-db23d5de27187dd8f2ec5c6dfd98a8a363b0fda5.tar.gz | |
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>
Diffstat (limited to 'libavcodec/wmv2.h')
| -rw-r--r-- | libavcodec/wmv2.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/wmv2.h b/libavcodec/wmv2.h index c69c9f48ee..fd7118776d 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; |