diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-27 19:20:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-27 19:24:44 +0200 |
| commit | 1fd0e9a56d757a365492d3329ffe1c49e61d47f6 (patch) | |
| tree | af2b690e26c07ac42db0b391c8fcf08efa5db5f7 /libavcodec/mpegvideo.h | |
| parent | 3ac51145304f9996152a80f5a191ced7b857a252 (diff) | |
| parent | 5dd8c08fd5e4c04d7a08d8934f0098a8a4a35c28 (diff) | |
Merge commit '5dd8c08fd5e4c04d7a08d8934f0098a8a4a35c28'
* commit '5dd8c08fd5e4c04d7a08d8934f0098a8a4a35c28':
mpeg: Change ff_convert_matrix() to take an MpegEncContext parameter
Conflicts:
libavcodec/mpegvideo.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 8ec35457c6..e9cd0c86a8 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -757,7 +757,7 @@ void ff_set_qscale(MpegEncContext * s, int qscale); int ff_dct_common_init(MpegEncContext *s); int ff_dct_encode_init(MpegEncContext *s); -void ff_convert_matrix(DSPContext *dsp, int (*qmat)[64], uint16_t (*qmat16)[2][64], +void ff_convert_matrix(MpegEncContext *s, int (*qmat)[64], uint16_t (*qmat16)[2][64], const uint16_t *quant_matrix, int bias, int qmin, int qmax, int intra); int ff_dct_quantize_c(MpegEncContext *s, int16_t *block, int n, int qscale, int *overflow); |