diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-02 21:00:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-02 21:01:10 +0200 |
| commit | 50b0edea9f48c831909313c15b0677957789ff53 (patch) | |
| tree | 9c1dbf2e74e027022cefbba74543b747d8884485 /libavcodec/intrax8.h | |
| parent | 083e65cfd22e44719eedfad4c2d3ed290688661d (diff) | |
| parent | 15616eb04206b64bcf08ad351f4c754e69e00666 (diff) | |
| download | ffmpeg-50b0edea9f48c831909313c15b0677957789ff53.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
intrax8: move functions from dsputil to own context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/intrax8.h')
| -rw-r--r-- | libavcodec/intrax8.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h index 8ce4f8d098..dd2dc7d696 100644 --- a/libavcodec/intrax8.h +++ b/libavcodec/intrax8.h @@ -21,6 +21,7 @@ #include "get_bits.h" #include "mpegvideo.h" +#include "intrax8dsp.h" typedef struct{ VLC * j_ac_vlc[4];//they point to the static j_mb_vlc @@ -33,6 +34,7 @@ typedef struct{ ScanTable scantable[3]; //set by the caller codec MpegEncContext * s; + IntraX8DSPContext dsp; int quant; int dquant; int qsum; |