mpegvideo: Don't use ff_mspel_motion() for vc1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 20 Nov 2011 16:19:25 +0000 (17:19 +0100)
committerAnton Khirnov <anton@khirnov.net>
Sat, 6 Oct 2012 07:46:14 +0000 (09:46 +0200)
commitc82ae85a8a78a98f7c7fea68d24a4ac0ca74d01f
tree89fc16d38c93821e651c0c5fa1e9072ce46bd6c0
parentfd7426ed898533bed98e6b472ff5f5c8e47f2eb5
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.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 18f2d5cb9c48d06895960f37467576725c9dc2d1)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit da0c457663479bc1828918e1bb3e4a5e4de0d557)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 899d95efe12f1e250b361837c1c8c06df9ac9b86)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
libavcodec/mpegvideo_common.h