[FFmpeg-cvslog] mpegvideo: dont use ff_mspel_motion() for vc1
Michael Niedermayer
git at videolan.org
Sun Nov 20 17:27:00 CET 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov 20 17:19:25 2011 +0100| [50d6f8195658d529c57bb42dfd8d7a71d60a9f1d] | committer: Michael Niedermayer
mpegvideo: dont use ff_mspel_motion() for vc1
Fixes Ticket655
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=50d6f8195658d529c57bb42dfd8d7a71d60a9f1d
---
libavcodec/mpegvideo_common.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libavcodec/mpegvideo_common.h b/libavcodec/mpegvideo_common.h
index a4d0167..bf6c4db 100644
--- a/libavcodec/mpegvideo_common.h
+++ b/libavcodec/mpegvideo_common.h
@@ -725,7 +725,7 @@ static av_always_inline void MPV_motion_internal(MpegEncContext *s,
0, 0, 0,
ref_picture, pix_op, qpix_op,
s->mv[dir][0][0], s->mv[dir][0][1], 16);
- }else if(!is_mpeg12 && (CONFIG_WMV2_DECODER || CONFIG_WMV2_ENCODER) && s->mspel){
+ }else if(!is_mpeg12 && (CONFIG_WMV2_DECODER || CONFIG_WMV2_ENCODER) && s->mspel && s->codec_id == CODEC_ID_WMV2){
ff_mspel_motion(s, dest_y, dest_cb, dest_cr,
ref_picture, pix_op,
s->mv[dir][0][0], s->mv[dir][0][1], 16);
More information about the ffmpeg-cvslog
mailing list