summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Oliver <protogonoi@gmail.com>2016-03-16 22:28:29 +1100
committerMatt Oliver <protogonoi@gmail.com>2016-03-16 22:30:56 +1100
commit109dfed7fc265f3e071854d5e6de5dd7f82ff9fb (patch)
tree6db6a457baf5f9e98bb57da56098bbcd57fa1c94
parent73f3c8f73edf0a69502233b2c50fa9e7104f99ec (diff)
lavc/dxva2_h264: Fix incorrect assert statement.
Signed-off-by: Matt Oliver <protogonoi@gmail.com>
-rw-r--r--libavcodec/dxva2_h264.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c
index 61cce3ae2d..54f2b8094e 100644
--- a/libavcodec/dxva2_h264.c
+++ b/libavcodec/dxva2_h264.c
@@ -426,7 +426,12 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx,
slice_data = ctx_pic->slice_long;
slice_size = ctx_pic->slice_count * sizeof(*ctx_pic->slice_long);
}
- assert((bs->DataSize & 127) == 0);
+#if CONFIG_D3D11VA
+ assert((((D3D11_VIDEO_DECODER_BUFFER_DESC *)bs)->DataSize & 127) == 0);
+#endif
+#if CONFIG_DXVA2
+ assert((((DXVA2_DecodeBufferDesc *)bs)->DataSize & 127) == 0);
+#endif
return ff_dxva2_commit_buffer(avctx, ctx, sc,
type,
slice_data, slice_size, mb_count);