diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-06 02:56:41 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-06 03:34:08 +0400 |
| commit | aa61ca0c592b6169edf82990078579ada49a3332 (patch) | |
| tree | 5eff589b0be2b0e7fb601b4efd0c3670a51dc371 /libavcodec/h264dsp_template.c | |
| parent | f428c29c23931620eafe692bede0773f66fe17e3 (diff) | |
| parent | d3f751e6030545c5e1f312c5a83c1e6ed5794f18 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Add some missing mathematics.h #includes for av_rescale().
opencore-amr: Add missing initializer braces to shut up gcc warning.
ARM: workaround for bug in GNU assembler
dv: fix comment wording mistake
Rename libavcodec/high_bit_depth.h ---> libavcodec/bit_depth_template.c
dv: fix valgrind use of uninitialised value warnings.
mxfenc: fix ignored drop flag in binary timecode representation.
PPC: use Altivec IMDCT only for supported sizes
dv: fix comment spelling
configure: simplify -rpath-link linker flag
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264dsp_template.c')
| -rw-r--r-- | libavcodec/h264dsp_template.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264dsp_template.c b/libavcodec/h264dsp_template.c index eb336f7e62..906d99f739 100644 --- a/libavcodec/h264dsp_template.c +++ b/libavcodec/h264dsp_template.c @@ -25,7 +25,7 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ -#include "high_bit_depth.h" +#include "bit_depth_template.c" #define op_scale1(x) block[x] = av_clip_pixel( (block[x]*weight + offset) >> log2_denom ) #define op_scale2(x) dst[x] = av_clip_pixel( (src[x]*weights + dst[x]*weightd + offset) >> (log2_denom+1)) |