Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
c198295d
Commit
c198295d
authored
Mar 16, 2016
by
Hendrik Leppkes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dxva2_h264: fix size alignment asserts
Convert them to av_assert0 in the process
parent
c43d4858
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
dxva2_h264.c
libavcodec/dxva2_h264.c
+6
-6
No files found.
libavcodec/dxva2_h264.c
View file @
c198295d
...
...
@@ -20,6 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/avassert.h"
#include "h264.h"
#include "h264data.h"
#include "mpegutils.h"
...
...
@@ -405,6 +407,8 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx,
dsc11
->
NumMBsInBuffer
=
mb_count
;
type
=
D3D11_VIDEO_DECODER_BUFFER_SLICE_CONTROL
;
av_assert0
((
dsc11
->
DataSize
&
127
)
==
0
);
}
#endif
#if CONFIG_DXVA2
...
...
@@ -416,6 +420,8 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx,
dsc2
->
NumMBsInBuffer
=
mb_count
;
type
=
DXVA2_SliceControlBufferType
;
av_assert0
((
dsc2
->
DataSize
&
127
)
==
0
);
}
#endif
...
...
@@ -426,12 +432,6 @@ 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
);
}
#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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment