diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 22:38:54 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-10-19 15:42:35 +0300 |
| commit | 6bcdfe48d0d0a4fbe012f5b983d5c8ee53af1883 (patch) | |
| tree | 15880ee5fbd6a7fd9374f787f69216e654837c1c /libavcodec | |
| parent | 61cc99748c1107a2f07491ce768156cc74b95e29 (diff) | |
| download | ffmpeg-6bcdfe48d0d0a4fbe012f5b983d5c8ee53af1883.tar.gz | |
mpeg4videodec: Disable frame multithreading for GMC, its not implemented at all
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegvideo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index d6f7af2f4a..af9e0403de 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: |