dsputil: allow 9/10-bit functions for non-h264 codecs

Signed-off-by: Mans Rullgard <mans@mansr.com>

dsputil: allow 9/10-bit functions for non-h264 codecs
Signed-off-by: Mans Rullgard <mans@mansr.com>
a82beafd · Mans Rullgard · 42c27f2e · a82beafd
Commit a82beafd authored Jul 21, 2011 by Mans Rullgard
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 15 deletions

dsputil.c libavcodec/dsputil.c +12 -15

No files found.
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -3192,21 +3192,18 @@ av_cold void dsputil_init(DSPContext* c, AVCodecContext *avctx)
    dspfunc2(avg_h264_qpel, 1,  8, depth);\
    dspfunc2(avg_h264_qpel, 2,  4, depth);
-    if (avctx->codec_id != CODEC_ID_H264 || avctx->bits_per_raw_sample == 8) {
+    switch (avctx->bits_per_raw_sample) {
-        BIT_DEPTH_FUNCS(8)
+    case 9:
-    } else {
+        BIT_DEPTH_FUNCS(9);
-        switch (avctx->bits_per_raw_sample) {
+        break;
-            case 9:
+    case 10:
-                BIT_DEPTH_FUNCS(9)
+        BIT_DEPTH_FUNCS(10);
-                break;
+        break;
-            case 10:
+    default:
-                BIT_DEPTH_FUNCS(10)
+        av_log(avctx, AV_LOG_DEBUG, "Unsupported bit depth: %d\n", avctx->bits_per_raw_sample);
-                break;
+    case 8:
-            default:
+        BIT_DEPTH_FUNCS(8);
-                av_log(avctx, AV_LOG_DEBUG, "Unsupported bit depth: %d\n", avctx->bits_per_raw_sample);
+        break;
-                BIT_DEPTH_FUNCS(8)
-                break;
-        }
    }