summaryrefslogtreecommitdiffstats
path: root/libavcodec/h264pred.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-07-05 01:33:51 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-07-10 02:17:52 +0200
commit5d05acba0e8c300b0a51ffc73c27f71ef1cafa13 (patch)
treeb35ee91fd4136ba58f023b251ce012be1a3bafb6 /libavcodec/h264pred.c
parent69d5e40e5afe24439a5b820ca135e1609c8d58a0 (diff)
downloadffmpeg-streaming-5d05acba0e8c300b0a51ffc73c27f71ef1cafa13.zip
ffmpeg-streaming-5d05acba0e8c300b0a51ffc73c27f71ef1cafa13.tar.gz
h264pred: 12 and 14 bit support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264pred.c')
-rw-r--r--libavcodec/h264pred.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/libavcodec/h264pred.c b/libavcodec/h264pred.c
index 9943d93..a9d454a 100644
--- a/libavcodec/h264pred.c
+++ b/libavcodec/h264pred.c
@@ -40,6 +40,14 @@
#include "h264pred_template.c"
#undef BIT_DEPTH
+#define BIT_DEPTH 12
+#include "h264pred_template.c"
+#undef BIT_DEPTH
+
+#define BIT_DEPTH 14
+#include "h264pred_template.c"
+#undef BIT_DEPTH
+
static void pred4x4_vertical_vp8_c(uint8_t *src, const uint8_t *topright, int stride){
const unsigned lt = src[-1-1*stride];
LOAD_TOP_EDGE
@@ -528,6 +536,12 @@ void ff_h264_pred_init(H264PredContext *h, int codec_id, const int bit_depth, co
case 10:
H264_PRED(10)
break;
+ case 12:
+ H264_PRED(12)
+ break;
+ case 14:
+ H264_PRED(14)
+ break;
default:
av_assert0(bit_depth<=8);
H264_PRED(8)
OpenPOWER on IntegriCloud