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
225083ac
Commit
225083ac
authored
Jun 12, 2011
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mpeg12: replace 2 asserts by av_assert0
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
d127d269
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
mpeg12.c
libavcodec/mpeg12.c
+3
-2
No files found.
libavcodec/mpeg12.c
View file @
225083ac
...
...
@@ -30,6 +30,7 @@
#include "avcodec.h"
#include "dsputil.h"
#include "mpegvideo.h"
#include "libavutil/avassert.h"
#include "mpeg12.h"
#include "mpeg12data.h"
...
...
@@ -2339,7 +2340,7 @@ static int decode_chunks(AVCodecContext *avctx,
if
(
s2
->
pict_type
!=
AV_PICTURE_TYPE_B
||
avctx
->
skip_frame
<=
AVDISCARD_DEFAULT
){
if
(
HAVE_THREADS
&&
(
avctx
->
active_thread_type
&
FF_THREAD_SLICE
)){
int
i
;
a
ssert
(
avctx
->
thread_count
>
1
);
a
v_assert0
(
avctx
->
thread_count
>
1
);
avctx
->
execute
(
avctx
,
slice_decode_thread
,
&
s2
->
thread_context
[
0
],
NULL
,
s
->
slice_count
,
sizeof
(
void
*
));
for
(
i
=
0
;
i
<
s
->
slice_count
;
i
++
)
...
...
@@ -2508,7 +2509,7 @@ static int decode_chunks(AVCodecContext *avctx,
if
(
HAVE_THREADS
&&
(
avctx
->
active_thread_type
&
FF_THREAD_SLICE
)){
int
threshold
=
(
s2
->
mb_height
*
s
->
slice_count
+
avctx
->
thread_count
/
2
)
/
avctx
->
thread_count
;
a
ssert
(
avctx
->
thread_count
>
1
);
a
v_assert0
(
avctx
->
thread_count
>
1
);
if
(
threshold
<=
mb_y
){
MpegEncContext
*
thread_context
=
s2
->
thread_context
[
s
->
slice_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