[FFmpeg-cvslog] dsputil: allow 9/10-bit functions for non-h264 codecs

[Mans Rullgard]

ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Thu Jul 21 02:21:14 2011 +0100| [a82beafd64529cba8c20bd24f63d6af7dccffb7d] | committer: Mans Rullgard

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

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

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

 libavcodec/dsputil.c |   27 ++++++++++++---------------
 1 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index fa9b591..4008389 100644
--- 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) {
-        BIT_DEPTH_FUNCS(8)
-    } else {
-        switch (avctx->bits_per_raw_sample) {
-            case 9:
-                BIT_DEPTH_FUNCS(9)
-                break;
-            case 10:
-                BIT_DEPTH_FUNCS(10)
-                break;
-            default:
-                av_log(avctx, AV_LOG_DEBUG, "Unsupported bit depth: %d\n", avctx->bits_per_raw_sample);
-                BIT_DEPTH_FUNCS(8)
-                break;
-        }
+    switch (avctx->bits_per_raw_sample) {
+    case 9:
+        BIT_DEPTH_FUNCS(9);
+        break;
+    case 10:
+        BIT_DEPTH_FUNCS(10);
+        break;
+    default:
+        av_log(avctx, AV_LOG_DEBUG, "Unsupported bit depth: %d\n", avctx->bits_per_raw_sample);
+    case 8:
+        BIT_DEPTH_FUNCS(8);
+        break;
     }