Commit 6d6373dc authored by Michael Niedermayer's avatar Michael Niedermayer Committed by Anton Khirnov

mpegvideo: Don't use ff_mspel_motion() for vc1

Using ff_mspel_motion assumes that s (a MpegEncContext
poiinter) really is a Wmv2Context.

This fixes crashes in error resilience on vc1/wmv3 videos.

Signed-off-by: 's avatarMartin Storsjö <>
(cherry picked from commit 18f2d5cb)
Signed-off-by: 's avatarAnton Khirnov <>
(cherry picked from commit da0c4576)
Signed-off-by: 's avatarAnton Khirnov <>
(cherry picked from commit 899d95ef)
Signed-off-by: 's avatarAnton Khirnov <>
(cherry picked from commit c82ae85a)

Signed-off-by: 's avatarAnton Khirnov <>
parent 7296a6b5
......@@ -727,7 +727,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 && s->mspel){
}else if(!is_mpeg12 && CONFIG_WMV2 && 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);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment