aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-07-05 01:34:12 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-07-10 02:17:52 +0200
commit1465ecf0598ee1d6218b19476994e1afd14287c3 (patch)
tree459cbf9031573329d347564cd5c9e7554a7aa8bf
parent5d05acba0e8c300b0a51ffc73c27f71ef1cafa13 (diff)
downloadffmpeg-1465ecf0598ee1d6218b19476994e1afd14287c3.tar.gz
h264dsp: 12 and 14 bit support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/h264dsp.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/libavcodec/h264dsp.c b/libavcodec/h264dsp.c
index 6e329f2536..e247677df3 100644
--- a/libavcodec/h264dsp.c
+++ b/libavcodec/h264dsp.c
@@ -42,6 +42,14 @@
#include "h264dsp_template.c"
#undef BIT_DEPTH
+#define BIT_DEPTH 12
+#include "h264dsp_template.c"
+#undef BIT_DEPTH
+
+#define BIT_DEPTH 14
+#include "h264dsp_template.c"
+#undef BIT_DEPTH
+
void ff_h264dsp_init(H264DSPContext *c, const int bit_depth, const int chroma_format_idc)
{
#undef FUNC
@@ -107,6 +115,12 @@ void ff_h264dsp_init(H264DSPContext *c, const int bit_depth, const int chroma_fo
case 10:
H264_DSP(10);
break;
+ case 12:
+ H264_DSP(12);
+ break;
+ case 14:
+ H264_DSP(14);
+ break;
default:
av_assert0(bit_depth<=8);
H264_DSP(8);