Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-07-10 16:21:06 +0400
committerMichael Niedermayer <michaelni@gmx.at>2012-07-10 16:24:10 +0400
commit71c689e83ed39282b541dc8b41dab849ae0a65b5 (patch)
treed82b3223b639aba2718e253fcde89d4dd5141df4 /libavcodec/dsputil.c
parent7307746444c411c6be875068da606cf750d30867 (diff)
dsputil: turn assert into if() as its possible to trigger with ffv1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.c')
-rw-r--r--libavcodec/dsputil.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 05140e32ea..357792693e 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -3176,8 +3176,9 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx)
}
break;
default:
- av_assert0(avctx->bits_per_raw_sample<=8 || avctx->codec_type != AVMEDIA_TYPE_VIDEO);
- BIT_DEPTH_FUNCS(8, _16);
+ if(avctx->bits_per_raw_sample<=8 || avctx->codec_type != AVMEDIA_TYPE_VIDEO) {
+ BIT_DEPTH_FUNCS(8, _16);
+ }
break;
}