1. ffmpeg
  2. Commit 9b667da05d43063f602715feca037a999dee8000
Browse code

mpegvideo: dont use ff_mspel_motion() for vc1 Fixes Ticket655

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 50d6f8195658d529c57bb42dfd8d7a71d60a9f1d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2011/11/21 01:19:25
Showing 1 changed files
libavcodec/mpegvideo_common.h
History View file @ 9b667da
... ... 
@@ -725,7 +725,7 @@ static av_always_inline void MPV_motion_internal(MpegEncContext *s,
725 725 
                         0, 0, 0,
726 726 
                         ref_picture, pix_op, qpix_op,
727 727 
                         s->mv[dir][0][0], s->mv[dir][0][1], 16);
728 
-        }else if(!is_mpeg12 && (CONFIG_WMV2_DECODER || CONFIG_WMV2_ENCODER) && s->mspel){
728 
+        }else if(!is_mpeg12 && (CONFIG_WMV2_DECODER || CONFIG_WMV2_ENCODER) && s->mspel && s->codec_id == CODEC_ID_WMV2){
729 729 
             ff_mspel_motion(s, dest_y, dest_cb, dest_cr,
730 730 
                         ref_picture, pix_op,
731 731 
                         s->mv[dir][0][0], s->mv[dir][0][1], 16);