| Révision | fe0ac337bd6b4783162bc55eb62f82181d498d5e (tree) |
|---|---|
| l'heure | 2011-09-12 00:36:37 |
| Auteur | Michael Niedermayer <michaelni@gmx....> |
| Commiter | Michael Niedermayer |
mpeg4videodec: Fix new slice end detection for missing slices.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg4videodec.c (diff)| @@ -1489,6 +1489,16 @@ end: | ||
| 1489 | 1489 | return -1; |
| 1490 | 1490 | } else if (s->mb_x + s->mb_y*s->mb_width + 1 >= next) |
| 1491 | 1491 | return SLICE_END; |
| 1492 | + | |
| 1493 | + if(s->pict_type==AV_PICTURE_TYPE_B){ | |
| 1494 | + const int delta= s->mb_x + 1 == s->mb_width ? 2 : 1; | |
| 1495 | + ff_thread_await_progress((AVFrame*)s->next_picture_ptr, | |
| 1496 | + (s->mb_x + delta >= s->mb_width) ? FFMIN(s->mb_y+1, s->mb_height-1) : s->mb_y, 0); | |
| 1497 | + if (s->next_picture.f.mbskip_table[xy + delta]) | |
| 1498 | + return SLICE_OK; | |
| 1499 | + } | |
| 1500 | + | |
| 1501 | + return SLICE_END; | |
| 1492 | 1502 | } |
| 1493 | 1503 | } |
| 1494 | 1504 |
Fork