| @@ -44,7 +44,7 @@ struct dxva2_picture_context { · 43 unmodified lines |
| 44 | static void fill_picture_entry(DXVA_PicEntry_H264 *pic, | 44 | static void fill_picture_entry(DXVA_PicEntry_H264 *pic, |
| 45 | unsigned index, unsigned flag) | 45 | unsigned index, unsigned flag) |
| 46 | { | 46 | { |
| 47 | assert((index&0x7f) == index && (flag&0x01) == flag); | 47 | av_assert0((index&0x7f) == index && (flag&0x01) == flag); |
| 48 | pic->bPicEntry = index | (flag << 7); | 48 | pic->bPicEntry = index | (flag << 7); |
| 49 | } | 49 | } |
| 50 | | 50 | |
| @@ -194,8 +194,8 @@ void ff_dxva2_h264_fill_scaling_lists(const AVCodecContext *avctx, AVDXVAContext · 143 unmodified lines |
| 194 | | 194 | |
| 195 | static int is_slice_short(const AVCodecContext *avctx, AVDXVAContext *ctx) | 195 | static int is_slice_short(const AVCodecContext *avctx, AVDXVAContext *ctx) |
| 196 | { | 196 | { |
| 197 | assert(DXVA_CONTEXT_CFG_BITSTREAM(avctx, ctx) == 1 || | 197 | av_assert0(DXVA_CONTEXT_CFG_BITSTREAM(avctx, ctx) == 1 || |
| 198 | DXVA_CONTEXT_CFG_BITSTREAM(avctx, ctx) == 2); | 198 | DXVA_CONTEXT_CFG_BITSTREAM(avctx, ctx) == 2); |
| 199 | return DXVA_CONTEXT_CFG_BITSTREAM(avctx, ctx) == 2; | 199 | return DXVA_CONTEXT_CFG_BITSTREAM(avctx, ctx) == 2; |
| 200 | } | 200 | } |
| 201 | | 201 | |
| @@ -348,10 +348,10 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, · 146 unmodified lines |
| 348 | static const unsigned start_code_size = sizeof(start_code); | 348 | static const unsigned start_code_size = sizeof(start_code); |
| 349 | unsigned position, size; | 349 | unsigned position, size; |
| 350 | | 350 | |
| 351 | assert(offsetof(DXVA_Slice_H264_Short, BSNALunitDataLocation) == | 351 | av_assert0(offsetof(DXVA_Slice_H264_Short, BSNALunitDataLocation) == |
| 352 | offsetof(DXVA_Slice_H264_Long, BSNALunitDataLocation)); | 352 | offsetof(DXVA_Slice_H264_Long, BSNALunitDataLocation)); |
| 353 | assert(offsetof(DXVA_Slice_H264_Short, SliceBytesInBuffer) == | 353 | av_assert0(offsetof(DXVA_Slice_H264_Short, SliceBytesInBuffer) == |
| 354 | offsetof(DXVA_Slice_H264_Long, SliceBytesInBuffer)); | 354 | offsetof(DXVA_Slice_H264_Long, SliceBytesInBuffer)); |
| 355 | | 355 | |
| 356 | if (is_slice_short(avctx, ctx)) | 356 | if (is_slice_short(avctx, ctx)) |
| 357 | slice = &ctx_pic->slice_short[i]; | 357 | slice = &ctx_pic->slice_short[i]; |
| @@ -453,7 +453,7 @@ static int dxva2_h264_start_frame(AVCodecContext *avctx, · 95 unmodified lines |
| 453 | | 453 | |
| 454 | if (!DXVA_CONTEXT_VALID(avctx, ctx)) | 454 | if (!DXVA_CONTEXT_VALID(avctx, ctx)) |
| 455 | return -1; | 455 | return -1; |
| 456 | assert(ctx_pic); | 456 | av_assert0(ctx_pic); |
| 457 | | 457 | |
| 458 | /* Fill up DXVA_PicParams_H264 */ | 458 | /* Fill up DXVA_PicParams_H264 */ |
| 459 | ff_dxva2_h264_fill_picture_parameters(avctx, ctx, &ctx_pic->pp); | 459 | ff_dxva2_h264_fill_picture_parameters(avctx, ctx, &ctx_pic->pp); |