diff options
Diffstat (limited to 'libavcodec/h264qpel.c')
| -rw-r--r-- | libavcodec/h264qpel.c | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/libavcodec/h264qpel.c b/libavcodec/h264qpel.c index 1bf31688f5..f46da8f6c8 100644 --- a/libavcodec/h264qpel.c +++ b/libavcodec/h264qpel.c @@ -2,25 +2,26 @@ * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder * Copyright (c) 2003-2010 Michael Niedermayer <michaelni@gmx.at> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "h264qpel.h" +#define pixeltmp int16_t #define BIT_DEPTH 8 #include "h264qpel_template.c" #undef BIT_DEPTH @@ -32,6 +33,17 @@ #define BIT_DEPTH 10 #include "h264qpel_template.c" #undef BIT_DEPTH +#undef pixeltmp + +#define pixeltmp int32_t +#define BIT_DEPTH 12 +#include "h264qpel_template.c" +#undef BIT_DEPTH + +#define BIT_DEPTH 14 +#include "h264qpel_template.c" +#undef BIT_DEPTH + void ff_h264qpel_init(H264QpelContext *c, int bit_depth) { @@ -75,6 +87,12 @@ void ff_h264qpel_init(H264QpelContext *c, int bit_depth) case 10: SET_QPEL(10); break; + case 12: + SET_QPEL(12); + break; + case 14: + SET_QPEL(14); + break; } if (ARCH_ARM) |