Module: libav Branch: master Commit: 6bcdfe48d0d0a4fbe012f5b983d5c8ee53af1883
Author: Michael Niedermayer <[email protected]> Committer: Martin Storsjö <[email protected]> Date: Fri Oct 12 22:38:54 2012 +0200 mpeg4videodec: Disable frame multithreading for GMC, its not implemented at all Signed-off-by: Martin Storsjö <[email protected]> --- libavcodec/mpegvideo.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index d6f7af2..af9e040 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1985,7 +1985,8 @@ int ff_MPV_lowest_referenced_row(MpegEncContext *s, int dir) int my_max = INT_MIN, my_min = INT_MAX, qpel_shift = !s->quarter_sample; int my, off, i, mvs; - if (s->picture_structure != PICT_FRAME) goto unhandled; + if (s->picture_structure != PICT_FRAME || s->mcsel) + goto unhandled; switch (s->mv_type) { case MV_TYPE_16X16: _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
