From 71c689e83ed39282b541dc8b41dab849ae0a65b5 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 10 Jul 2012 14:21:06 +0200
Subject: [PATCH] dsputil: turn assert into if() as its possible to trigger
with ffv1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libavcodec/dsputil.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 05140e32eab..357792693e5 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;
}
--
GitLab