diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 22:38:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 22:53:22 +0200 |
| commit | 5e885275f1eda3f0281747d9c78d072adb8bc940 (patch) | |
| tree | 2c4132813e8a4fe66687add9abeb4daff98b86df /libavcodec/mpegvideo.c | |
| parent | 0c40220b9dbcff104f38998f7170bdd4b70969cd (diff) | |
| download | ffmpeg-5e885275f1eda3f0281747d9c78d072adb8bc940.tar.gz | |
mpeg4videodec: disable frame multithreading for GMC, its not implemented at all
This fixes race conditions in decoding MPEG-4 GMC files
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index f4403ca3d1..2fe2c917a5 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -2344,7 +2344,7 @@ 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: |