Mercurial > libavcodec.hg
comparison mpegvideo.c @ 10745:a47f207fe4b5 libavcodec
Get rid of pointless CONFIG_WMV2 definition.
| author | diego |
|---|---|
| date | Wed, 30 Dec 2009 02:08:25 +0000 |
| parents | 9ea5f2f1874f |
| children | 4b2227257766 |
comparison
equal
deleted
inserted
replaced
| 10744:3e99ff77e0b7 | 10745:a47f207fe4b5 |
|---|---|
| 1964 add_dct(s, block[11], 11, dest_cr+8+dct_offset, dct_linesize); | 1964 add_dct(s, block[11], 11, dest_cr+8+dct_offset, dct_linesize); |
| 1965 } | 1965 } |
| 1966 } | 1966 } |
| 1967 }//fi gray | 1967 }//fi gray |
| 1968 } | 1968 } |
| 1969 else if (CONFIG_WMV2) { | 1969 else if (CONFIG_WMV2_DECODER || CONFIG_WMV2_ENCODER) { |
| 1970 ff_wmv2_add_mb(s, block, dest_y, dest_cb, dest_cr); | 1970 ff_wmv2_add_mb(s, block, dest_y, dest_cb, dest_cr); |
| 1971 } | 1971 } |
| 1972 } else { | 1972 } else { |
| 1973 /* dct only in intra block */ | 1973 /* dct only in intra block */ |
| 1974 if(s->encoding || !(s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO)){ | 1974 if(s->encoding || !(s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO)){ |