diff options
| author | Alex Converse <alex.converse@gmail.com> | 2011-05-24 16:28:45 -0700 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2011-05-25 13:24:25 -0700 |
| commit | 8c51620f219db0f408d2833c3e5d56cedaf0d95a (patch) | |
| tree | 5d1b86b1140ecd993606fe9b2403dacfc4af9a4d /libavcodec/mpegvideo.c | |
| parent | 19a686b8a373e93807880c63bd73303616c96b71 (diff) | |
| download | ffmpeg-8c51620f219db0f408d2833c3e5d56cedaf0d95a.tar.gz | |
Remove h263_msmpeg4 from MpegEncContext.
It was long ago superseded by msmpeg4_version.
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 09e813476a..f24e11910a 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1986,7 +1986,7 @@ void MPV_decode_mb_internal(MpegEncContext *s, DCTELEM block[12][64], } /* add dct residue */ - if(s->encoding || !( s->h263_msmpeg4 || s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO + if(s->encoding || !( s->msmpeg4_version || s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO || (s->codec_id==CODEC_ID_MPEG4 && !s->mpeg_quant))){ add_dequant_dct(s, block[0], 0, dest_y , dct_linesize, s->qscale); add_dequant_dct(s, block[1], 1, dest_y + block_size, dct_linesize, s->qscale); |