[FFmpeg-cvslog] dsputil: turn assert into if() as its possible to trigger with ffv1

Michael Niedermayer git at videolan.org
Tue Jul 10 14:24:56 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 10 14:21:06 2012 +0200| [71c689e83ed39282b541dc8b41dab849ae0a65b5] | committer: Michael Niedermayer

dsputil: turn assert into if() as its possible to trigger with ffv1

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=71c689e83ed39282b541dc8b41dab849ae0a65b5
---

 libavcodec/dsputil.c |    5 +++--
 1 file 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;
     }
 



More information about the ffmpeg-cvslog mailing list