Mercurial > mplayer.hg
changeset 34647:4397fd2d0a74
One more fix for --enable-zr.
This code is almost a duplicate of the one in libvo, but unfortunately
it has slightly different features.
Would be good to fix but unlikely that anyone will consider it
worth the effort.
| author | reimar |
|---|---|
| date | Sat, 18 Feb 2012 19:33:47 +0000 |
| parents | e0783849f3b6 |
| children | 26eddbd6353a |
| files | libmpcodecs/vf_zrmjpeg.c |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/vf_zrmjpeg.c Sat Feb 18 16:22:37 2012 +0000 +++ b/libmpcodecs/vf_zrmjpeg.c Sat Feb 18 19:33:47 2012 +0000 @@ -123,7 +123,7 @@ (QMAT_SHIFT-3))/ (qscale*quant_matrix[j])); } - } else if (s->dsp.fdct == fdct_ifast) { + } else if (s->dsp.fdct == ff_fdct_ifast) { for (i = 0; i < 64; i++) { const int j = s->dsp.idct_permutation[i]; /* 16 <= qscale * quant_matrix[i] <= 7905 @@ -447,7 +447,7 @@ j->s->out_format = FMT_MJPEG; j->s->intra_only = 1; // Generate only intra pictures for jpeg j->s->encoding = 1; // Set mode to encode - j->s->pict_type = FF_I_TYPE; + j->s->pict_type = AV_PICTURE_TYPE_I; j->s->y_dc_scale = 8; j->s->c_dc_scale = 8; @@ -500,7 +500,7 @@ /* make MPV_common_init allocate important buffers, like s->block * Also initializes dsputil */ - if (MPV_common_init(j->s) < 0) { + if (ff_MPV_common_init(j->s) < 0) { av_free(j->s); av_free(j); return NULL;