Skip to content

F
ffmpeg.wasm-core
Commit 225083ac authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

mpeg12: replace 2 asserts by av_assert0 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent d127d269
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
libavcodec/mpeg12.c
View file @ 225083ac
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "libavutil/avassert.h"
#include "mpeg12.h" #include "mpeg12.h"
#include "mpeg12data.h" #include "mpeg12data.h"
...@@ -2339,7 +2340,7 @@ static int decode_chunks(AVCodecContext *avctx, ...@@ -2339,7 +2340,7 @@ static int decode_chunks(AVCodecContext *avctx,
if(s2->pict_type != AV_PICTURE_TYPE_B || avctx->skip_frame <= AVDISCARD_DEFAULT){ if(s2->pict_type != AV_PICTURE_TYPE_B || avctx->skip_frame <= AVDISCARD_DEFAULT){
if(HAVE_THREADS && (avctx->active_thread_type & FF_THREAD_SLICE)){ if(HAVE_THREADS && (avctx->active_thread_type & FF_THREAD_SLICE)){
int i; int i;
assert(avctx->thread_count > 1); av_assert0(avctx->thread_count > 1);
avctx->execute(avctx, slice_decode_thread, &s2->thread_context[0], NULL, s->slice_count, sizeof(void*)); avctx->execute(avctx, slice_decode_thread, &s2->thread_context[0], NULL, s->slice_count, sizeof(void*));
for(i=0; i<s->slice_count; i++) for(i=0; i<s->slice_count; i++)
...@@ -2508,7 +2509,7 @@ static int decode_chunks(AVCodecContext *avctx, ...@@ -2508,7 +2509,7 @@ static int decode_chunks(AVCodecContext *avctx,
if(HAVE_THREADS && (avctx->active_thread_type & FF_THREAD_SLICE)){ 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; int threshold= (s2->mb_height*s->slice_count + avctx->thread_count/2) / avctx->thread_count;
assert(avctx->thread_count > 1); av_assert0(avctx->thread_count > 1);
if(threshold <= mb_y){ if(threshold <= mb_y){
MpegEncContext *thread_context= s2->thread_context[s->slice_count]; MpegEncContext *thread_context= s2->thread_context[s->slice_count];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment