summaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-07-10 14:21:06 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-07-10 14:24:10 +0200
commit71c689e83ed39282b541dc8b41dab849ae0a65b5 (patch)
treed82b3223b639aba2718e253fcde89d4dd5141df4 /libavcodec
parent7307746444c411c6be875068da606cf750d30867 (diff)
downloadffmpeg-streaming-71c689e83ed39282b541dc8b41dab849ae0a65b5.zip
ffmpeg-streaming-71c689e83ed39282b541dc8b41dab849ae0a65b5.tar.gz
dsputil: turn assert into if() as its possible to trigger with ffv1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/dsputil.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 05140e3..3577926 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;
}
OpenPOWER on IntegriCloud