diff options
Diffstat (limited to 'src/libmpeg2/slice_xvmc.c')
| -rw-r--r-- | src/libmpeg2/slice_xvmc.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/libmpeg2/slice_xvmc.c b/src/libmpeg2/slice_xvmc.c index 3e63bd77b..cddc517c8 100644 --- a/src/libmpeg2/slice_xvmc.c +++ b/src/libmpeg2/slice_xvmc.c @@ -1530,29 +1530,29 @@ do { \ mpeg2_mc.avg : mpeg2_mc.put)); \ } while (0) -#define NEXT_MACROBLOCK \ -do { \ - picture->offset += 16; \ - if (picture->offset == picture->coded_picture_width) { \ - do { /* just so we can use the break statement */ \ - if (picture->current_frame->copy) { \ - picture->current_frame->copy (picture->current_frame, \ - picture->dest); \ - if (picture->picture_coding_type == B_TYPE) \ - break; \ - } \ - picture->dest[0] += 16 * picture->pitches[0]; \ - picture->dest[1] += 8 * picture->pitches[1]; \ - picture->dest[2] += 8 * picture->pitches[2]; \ - } while (0); \ - picture->v_offset += 16; \ - if (picture->v_offset > picture->limit_y) { \ - if (mpeg2_cpu_state_restore) \ - mpeg2_cpu_state_restore (&cpu_state); \ - return; \ - } \ - picture->offset = 0; \ - } \ +#define NEXT_MACROBLOCK \ +do { \ + picture->offset += 16; \ + if (picture->offset == picture->coded_picture_width) { \ + do { /* just so we can use the break statement */ \ + if (picture->current_frame->proc_slice) { \ + picture->current_frame->proc_slice (picture->current_frame, \ + picture->dest); \ + if (picture->picture_coding_type == B_TYPE) \ + break; \ + } \ + picture->dest[0] += 16 * picture->pitches[0]; \ + picture->dest[1] += 8 * picture->pitches[1]; \ + picture->dest[2] += 8 * picture->pitches[2]; \ + } while (0); \ + picture->v_offset += 16; \ + if (picture->v_offset > picture->limit_y) { \ + if (mpeg2_cpu_state_restore) \ + mpeg2_cpu_state_restore (&cpu_state); \ + return; \ + } \ + picture->offset = 0; \ + } \ } while (0) static inline int slice_xvmc_init (picture_t * picture, int code) @@ -1634,7 +1634,7 @@ static inline int slice_xvmc_init (picture_t * picture, int code) picture->v_offset = (code - 1) * 16; offset = (code - 1); - if (picture->current_frame->copy && picture->picture_coding_type == B_TYPE) + if (picture->current_frame->proc_slice && picture->picture_coding_type == B_TYPE) offset = 0; else if (picture->picture_structure != FRAME_PICTURE) offset = 2 * offset; @@ -1710,7 +1710,7 @@ static inline int slice_xvmc_init (picture_t * picture, int code) while (picture->offset - picture->coded_picture_width >= 0) { picture->offset -= picture->coded_picture_width; - if ((picture->current_frame->copy == NULL) || + if ((picture->current_frame->proc_slice == NULL) || (picture->picture_coding_type != B_TYPE)) { picture->dest[0] += 16 * picture->pitches[0]; picture->dest[1] += 8 * picture->pitches[1]; |