diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-23 18:26:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-23 18:26:37 +0200 |
| commit | 4ca6a151e0c48f2729027ac263269cb50e88ed71 (patch) | |
| tree | 1307128caf78999abcf1600fd0fa8224770baa3b /libavcodec/vc1dsp.h | |
| parent | 276f43be68617c0d56001abf1e213911dd51fed7 (diff) | |
| parent | bc8c50512fc8550ae80535390379e00937623e00 (diff) | |
| download | ffmpeg-4ca6a151e0c48f2729027ac263269cb50e88ed71.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: print the codecs names in the stream mapping.
avconv: move the avcodec_find_decoder() call to add_input_streams().
Windows Media Image decoder (WMVP/WVP2)
ac3enc: remove outdated TODO comment for apply_channel_coupling()
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/vc1dec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1dsp.h')
| -rw-r--r-- | libavcodec/vc1dsp.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libavcodec/vc1dsp.h b/libavcodec/vc1dsp.h index 93a9ea3858..d96853aa16 100644 --- a/libavcodec/vc1dsp.h +++ b/libavcodec/vc1dsp.h @@ -60,6 +60,16 @@ typedef struct VC1DSPContext { /* This is really one func used in VC-1 decoding */ h264_chroma_mc_func put_no_rnd_vc1_chroma_pixels_tab[3]; h264_chroma_mc_func avg_no_rnd_vc1_chroma_pixels_tab[3]; + + /* Windows Media Image functions */ + void (*sprite_h)(uint8_t *dst, const uint8_t *src, int offset, int advance, int count); + void (*sprite_v_single)(uint8_t *dst, const uint8_t *src1a, const uint8_t *src1b, int offset, int width); + void (*sprite_v_double_noscale)(uint8_t *dst, const uint8_t *src1a, const uint8_t *src2a, int alpha, int width); + void (*sprite_v_double_onescale)(uint8_t *dst, const uint8_t *src1a, const uint8_t *src1b, int offset1, + const uint8_t *src2a, int alpha, int width); + void (*sprite_v_double_twoscale)(uint8_t *dst, const uint8_t *src1a, const uint8_t *src1b, int offset1, + const uint8_t *src2a, const uint8_t *src2b, int offset2, + int alpha, int width); } VC1DSPContext; void ff_vc1dsp_init(VC1DSPContext* c); |