Revision 6026a096 libavcodec/h264.c

View differences:

libavcodec/h264.c
7491 7491
            if((err = decode_slice_header(hx, h)))
7492 7492
               break;
7493 7493

  
7494
            if (s->avctx->hwaccel && h->current_slice == 1) {
7495
                if (s->avctx->hwaccel->start_frame(s->avctx, NULL, 0) < 0)
7496
                    return -1;
7497
            }
7498

  
7494 7499
            s->current_picture_ptr->key_frame |=
7495 7500
                    (hx->nal_unit_type == NAL_IDR_SLICE) ||
7496 7501
                    (h->sei_recovery_frame_cnt >= 0);
......
7715 7720
        h->prev_frame_num_offset= h->frame_num_offset;
7716 7721
        h->prev_frame_num= h->frame_num;
7717 7722

  
7723
        if (avctx->hwaccel) {
7724
            if (avctx->hwaccel->end_frame(avctx) < 0)
7725
                av_log(avctx, AV_LOG_ERROR, "hardware accelerator failed to decode picture\n");
7726
        }
7727

  
7718 7728
        if (CONFIG_H264_VDPAU_DECODER && s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
7719 7729
            ff_vdpau_h264_picture_complete(s);
7720 7730

  
......
8105 8115
    /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_DELAY,
8106 8116
    .flush= flush_dpb,
8107 8117
    .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"),
8108
    .pix_fmts= ff_pixfmt_list_420,
8118
    .pix_fmts= ff_hwaccel_pixfmt_list_420,
8109 8119
};
8110 8120

  
8111 8121
#if CONFIG_H264_VDPAU_DECODER

Also available in: Unified diff