diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 03:52:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 03:52:16 +0200 |
| commit | ca90ca8ce365261355f3b66936b9cc011fdd1cdc (patch) | |
| tree | 1ddcea613050917b11a53069c43ad6bc1725aec1 /libavcodec/indeo4.c | |
| parent | a58e10e5d1e9b26733087f536a0eb0c525523218 (diff) | |
| parent | 6647aa0426e73839b9b1d1c9d86188f469167531 (diff) | |
| download | ffmpeg-ca90ca8ce365261355f3b66936b9cc011fdd1cdc.tar.gz | |
Merge commit '6647aa0426e73839b9b1d1c9d86188f469167531'
* commit '6647aa0426e73839b9b1d1c9d86188f469167531':
indeo4: add missing Haar and slanted transforms
dxtory v2 support
Conflicts:
libavcodec/indeo4.c
libavcodec/ivi_dsp.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/indeo4.c')
| -rw-r--r-- | libavcodec/indeo4.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c index 5b107fb109..3a77ffdd56 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -56,8 +56,8 @@ static const struct { int is_2d_trans; } transforms[18] = { { ff_ivi_inverse_haar_8x8, ff_ivi_dc_haar_2d, 1 }, - { ff_ivi_inverse_haar_8x1, ff_ivi_dc_haar_2d, 1 }, - { ff_ivi_inverse_haar_1x8, ff_ivi_dc_haar_2d, 1 }, + { ff_ivi_row_haar8, ff_ivi_dc_haar_2d, 0 }, + { ff_ivi_col_haar8, ff_ivi_dc_haar_2d, 0 }, { ff_ivi_put_pixels_8x8, ff_ivi_put_dc_pixel_8x8, 1 }, { ff_ivi_inverse_slant_8x8, ff_ivi_dc_slant_2d, 1 }, { ff_ivi_row_slant8, ff_ivi_dc_row_slant, 1 }, @@ -65,13 +65,13 @@ static const struct { { NULL, NULL, 0 }, /* inverse DCT 8x8 */ { NULL, NULL, 0 }, /* inverse DCT 8x1 */ { NULL, NULL, 0 }, /* inverse DCT 1x8 */ - { NULL, NULL, 0 }, /* inverse Haar 4x4 */ + { ff_ivi_inverse_haar_4x4, ff_ivi_dc_haar_2d, 1 }, { ff_ivi_inverse_slant_4x4, ff_ivi_dc_slant_2d, 1 }, { NULL, NULL, 0 }, /* no transform 4x4 */ - { NULL, NULL, 0 }, /* inverse Haar 1x4 */ - { NULL, NULL, 0 }, /* inverse Haar 4x1 */ - { NULL, NULL, 0 }, /* inverse slant 1x4 */ - { NULL, NULL, 0 }, /* inverse slant 4x1 */ + { ff_ivi_row_haar4, ff_ivi_dc_haar_2d, 0 }, + { ff_ivi_col_haar4, ff_ivi_dc_haar_2d, 0 }, + { ff_ivi_row_slant4, ff_ivi_dc_row_slant, 0 }, + { ff_ivi_col_slant4, ff_ivi_dc_col_slant, 0 }, { NULL, NULL, 0 }, /* inverse DCT 4x4 */ }; |