Revision 8c9c0ea4

View differences:

libavcodec/dnxhdenc.c
330 330
    return bits;
331 331
}
332 332

  
333
static av_always_inline void dnxhd_get_pixels_4x8(DCTELEM *restrict block, const uint8_t *pixels, int line_size)
333
static av_always_inline void dnxhd_get_pixels_8x4(DCTELEM *restrict block, const uint8_t *pixels, int line_size)
334 334
{
335 335
    int i;
336 336
    for (i = 0; i < 4; i++) {
......
361 361

  
362 362
    if (mb_y+1 == ctx->m.mb_height && ctx->m.avctx->height == 1080) {
363 363
        if (ctx->interlaced) {
364
            dnxhd_get_pixels_4x8(ctx->blocks[4], ptr_y + ctx->dct_y_offset    , ctx->m.linesize);
365
            dnxhd_get_pixels_4x8(ctx->blocks[5], ptr_y + ctx->dct_y_offset + 8, ctx->m.linesize);
366
            dnxhd_get_pixels_4x8(ctx->blocks[6], ptr_u + ctx->dct_uv_offset   , ctx->m.uvlinesize);
367
            dnxhd_get_pixels_4x8(ctx->blocks[7], ptr_v + ctx->dct_uv_offset   , ctx->m.uvlinesize);
364
            dnxhd_get_pixels_8x4(ctx->blocks[4], ptr_y + ctx->dct_y_offset    , ctx->m.linesize);
365
            dnxhd_get_pixels_8x4(ctx->blocks[5], ptr_y + ctx->dct_y_offset + 8, ctx->m.linesize);
366
            dnxhd_get_pixels_8x4(ctx->blocks[6], ptr_u + ctx->dct_uv_offset   , ctx->m.uvlinesize);
367
            dnxhd_get_pixels_8x4(ctx->blocks[7], ptr_v + ctx->dct_uv_offset   , ctx->m.uvlinesize);
368 368
        } else {
369 369
            dsp->clear_block(ctx->blocks[4]); dsp->clear_block(ctx->blocks[5]);
370 370
            dsp->clear_block(ctx->blocks[6]); dsp->clear_block(ctx->blocks[7]);

Also available in: Unified diff