diff options
Diffstat (limited to 'libavcodec/dxva2_mpeg2.c')
| -rw-r--r-- | libavcodec/dxva2_mpeg2.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/libavcodec/dxva2_mpeg2.c b/libavcodec/dxva2_mpeg2.c index b6c23618d2..5feba93880 100644 --- a/libavcodec/dxva2_mpeg2.c +++ b/libavcodec/dxva2_mpeg2.c @@ -3,20 +3,20 @@ * * copyright (c) 2010 Laurent Aimar * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -44,14 +44,14 @@ static void fill_picture_parameters(AVCodecContext *avctx, int is_field = s->picture_structure != PICT_FRAME; memset(pp, 0, sizeof(*pp)); - pp->wDecodedPictureIndex = ff_dxva2_get_surface_index(ctx, current_picture); + pp->wDecodedPictureIndex = ff_dxva2_get_surface_index(ctx, ¤t_picture->f); pp->wDeblockedPictureIndex = 0; if (s->pict_type != AV_PICTURE_TYPE_I) - pp->wForwardRefPictureIndex = ff_dxva2_get_surface_index(ctx, &s->last_picture); + pp->wForwardRefPictureIndex = ff_dxva2_get_surface_index(ctx, &s->last_picture.f); else pp->wForwardRefPictureIndex = 0xffff; if (s->pict_type == AV_PICTURE_TYPE_B) - pp->wBackwardRefPictureIndex = ff_dxva2_get_surface_index(ctx, &s->next_picture); + pp->wBackwardRefPictureIndex = ff_dxva2_get_surface_index(ctx, &s->next_picture.f); else pp->wBackwardRefPictureIndex = 0xffff; pp->wPicWidthInMBminus1 = s->mb_width - 1; @@ -111,10 +111,10 @@ static void fill_quantization_matrices(AVCodecContext *avctx, qm->bNewQmatrix[i] = 1; for (i = 0; i < 64; i++) { int n = s->dsp.idct_permutation[ff_zigzag_direct[i]]; - qm->Qmatrix[0][i] = s->intra_matrix[n];; - qm->Qmatrix[1][i] = s->inter_matrix[n];; - qm->Qmatrix[2][i] = s->chroma_intra_matrix[n];; - qm->Qmatrix[3][i] = s->chroma_inter_matrix[n];; + qm->Qmatrix[0][i] = s->intra_matrix[n]; + qm->Qmatrix[1][i] = s->inter_matrix[n]; + qm->Qmatrix[2][i] = s->chroma_intra_matrix[n]; + qm->Qmatrix[3][i] = s->chroma_inter_matrix[n]; } } @@ -141,8 +141,7 @@ static void fill_slice(AVCodecContext *avctx, init_get_bits(&gb, &buffer[4], 8 * (size - 4)); slice->wQuantizerScaleCode = get_bits(&gb, 5); - while (get_bits1(&gb)) - skip_bits(&gb, 8); + skip_1stop_8data_bits(&gb); slice->wMBbitOffset = 4 * 8 + get_bits_count(&gb); } @@ -162,7 +161,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, if (FAILED(IDirectXVideoDecoder_GetBuffer(ctx->decoder, DXVA2_BitStreamDateBufferType, - &dxva_data, &dxva_size))) + (void **)&dxva_data, &dxva_size))) return -1; current = dxva_data; end = dxva_data + dxva_size; @@ -259,7 +258,7 @@ static int dxva2_mpeg2_end_frame(AVCodecContext *avctx) if (ctx_pic->slice_count <= 0 || ctx_pic->bitstream_size <= 0) return -1; - ret = ff_dxva2_common_end_frame(avctx, s->current_picture_ptr, + ret = ff_dxva2_common_end_frame(avctx, &s->current_picture_ptr->f, &ctx_pic->pp, sizeof(ctx_pic->pp), &ctx_pic->qm, sizeof(ctx_pic->qm), commit_bitstream_and_slice_buffer); |