diff options
| author | Michael Niedermayer <[email protected]> | 2011-11-20 17:19:25 +0100 |
|---|---|---|
| committer | Anton Khirnov <[email protected]> | 2012-10-06 10:35:19 +0200 |
| commit | 6d6373dc6441b26271d37ec372507e29c0123a88 (patch) | |
| tree | a249c7f4a37b75a052d9f405ff8411304d8de505 /libavformat/r3d.c | |
| parent | 7296a6b5e9c22be515f7bd60a3c6c293691de3f8 (diff) | |
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: [email protected]
Signed-off-by: Martin Storsjö <[email protected]>
(cherry picked from commit 18f2d5cb9c48d06895960f37467576725c9dc2d1)
Signed-off-by: Anton Khirnov <[email protected]>
(cherry picked from commit da0c457663479bc1828918e1bb3e4a5e4de0d557)
Signed-off-by: Anton Khirnov <[email protected]>
(cherry picked from commit 899d95efe12f1e250b361837c1c8c06df9ac9b86)
Signed-off-by: Anton Khirnov <[email protected]>
(cherry picked from commit c82ae85a8a78a98f7c7fea68d24a4ac0ca74d01f)
Conflicts:
libavcodec/mpegvideo_common.h
Signed-off-by: Anton Khirnov <[email protected]>
Diffstat (limited to 'libavformat/r3d.c')
0 files changed, 0 insertions, 0 deletions