diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-07 13:09:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-07 13:09:35 +0100 |
| commit | c4e394e46008c9e208f666d156f49f7ba500d73a (patch) | |
| tree | 4c70acf89ede1f9d24ec3056bb2d586f98a12bcd /libavcodec/cavs.h | |
| parent | b5884db437eebe136efef63a8186b7b4b51b5525 (diff) | |
| parent | 79dad2a932534d1155079f937649e099f9e5cc27 (diff) | |
| download | ffmpeg-c4e394e46008c9e208f666d156f49f7ba500d73a.tar.gz | |
Merge commit '79dad2a932534d1155079f937649e099f9e5cc27'
* commit '79dad2a932534d1155079f937649e099f9e5cc27':
dsputil: Separate h264chroma
Conflicts:
libavcodec/dsputil_template.c
libavcodec/ppc/dsputil_ppc.c
libavcodec/vc1dec.c
libavcodec/vc1dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cavs.h')
| -rw-r--r-- | libavcodec/cavs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/cavs.h b/libavcodec/cavs.h index 73e6bfe8c6..b0cdb8f200 100644 --- a/libavcodec/cavs.h +++ b/libavcodec/cavs.h @@ -24,6 +24,7 @@ #include "cavsdsp.h" #include "dsputil.h" +#include "h264chroma.h" #include "get_bits.h" #include "videodsp.h" @@ -161,6 +162,7 @@ typedef struct AVSFrame { typedef struct AVSContext { AVCodecContext *avctx; DSPContext dsp; + H264ChromaContext h264chroma; VideoDSPContext vdsp; CAVSDSPContext cdsp; GetBitContext gb; |