Mercurial > mplayer.hg
diff libmpcodecs/vf_zrmjpeg.c @ 35743:68db224c2275
libmpcodec&libvo: avoid use of DCTELEM as it will disappear from ffmpeg.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| author | michael |
|---|---|
| date | Wed, 23 Jan 2013 16:43:59 +0000 |
| parents | 8517826b0dbd |
| children | 389d43c448b3 |
line wrap: on
line diff
--- a/libmpcodecs/vf_zrmjpeg.c Wed Jan 23 16:04:33 2013 +0000 +++ b/libmpcodecs/vf_zrmjpeg.c Wed Jan 23 16:43:59 2013 +0000 @@ -65,7 +65,7 @@ "vf_zrmjpeg: " __VA_ARGS__) /// The get_pixels() routine to use. The real routine comes from dsputil -static void (*get_pixels)(DCTELEM *restrict block, const uint8_t *pixels, int line_size); +static void (*get_pixels)(int16_t *restrict block, const uint8_t *pixels, int line_size); /* Begin excessive code duplication ************************************/ /* Code coming from mpegvideo.c and mjpeg.c in ../libavcodec ***********/ @@ -196,7 +196,7 @@ * * This routine is a duplicate of encode_block in mjpeg.c */ -static void encode_block(MpegEncContext *s, DCTELEM *block, int n) { +static void encode_block(MpegEncContext *s, int16_t *block, int n) { int mant, nbits, code, i, j; int component, dc, run, last_index, val; MJpegContext *m = s->mjpeg_ctx; @@ -267,7 +267,7 @@ * The max and min level, which are clipped to, are stored in * s->min_qcoeff and s->max_qcoeff respectively. */ -static inline void clip_coeffs(MpegEncContext *s, DCTELEM *block, +static inline void clip_coeffs(MpegEncContext *s, int16_t *block, int last_index) { int i; const int maxlevel= s->max_qcoeff;