diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-12 17:59:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-12 17:59:23 +0200 |
| commit | 225083ac0a2feead04ddd7485b8693dd9c742379 (patch) | |
| tree | f07df3562fa072cb1b8007c8a3a809a0749a5ac5 /libavcodec/mpeg12.c | |
| parent | d127d26997ff046a9f112643eebd1007590b4fa2 (diff) | |
| download | ffmpeg-streaming-225083ac0a2feead04ddd7485b8693dd9c742379.zip ffmpeg-streaming-225083ac0a2feead04ddd7485b8693dd9c742379.tar.gz | |
mpeg12: replace 2 asserts by av_assert0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 09bed28..bd858a5 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -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; - 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*)); 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; - assert(avctx->thread_count > 1); + av_assert0(avctx->thread_count > 1); if(threshold <= mb_y){ MpegEncContext *thread_context= s2->thread_context[s->slice_count]; |
