Mercurial > libavcodec.hg

comparison mpegvideo_common.h @ 10745:a47f207fe4b5 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Get rid of pointless CONFIG_WMV2 definition.
author diego
date Wed, 30 Dec 2009 02:08:25 +0000
parents ce2cf9e32b09
children 7dd2a45249a9
comparison
equal deleted inserted replaced
10744:3e99ff77e0b7 10745:a47f207fe4b5
725 }else if(!is_mpeg12 && s->quarter_sample){ 725 }else if(!is_mpeg12 && s->quarter_sample){
726 qpel_motion(s, dest_y, dest_cb, dest_cr, 726 qpel_motion(s, dest_y, dest_cb, dest_cr,
727 0, 0, 0, 727 0, 0, 0,
728 ref_picture, pix_op, qpix_op, 728 ref_picture, pix_op, qpix_op,
729 s->mv[dir][0][0], s->mv[dir][0][1], 16); 729 s->mv[dir][0][0], s->mv[dir][0][1], 16);
730 }else if(!is_mpeg12 && CONFIG_WMV2 && s->mspel){ 730 }else if(!is_mpeg12 && (CONFIG_WMV2_DECODER || CONFIG_WMV2_ENCODER) && s->mspel){
731 ff_mspel_motion(s, dest_y, dest_cb, dest_cr, 731 ff_mspel_motion(s, dest_y, dest_cb, dest_cr,
732 ref_picture, pix_op, 732 ref_picture, pix_op,
733 s->mv[dir][0][0], s->mv[dir][0][1], 16); 733 s->mv[dir][0][0], s->mv[dir][0][1], 16);
734 }else 734 }else
735 { 735 {