diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-02 05:12:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-02 05:12:10 +0200 |
| commit | cd8cb54990be4fbd23e28f9d7c2c6170d3667692 (patch) | |
| tree | 28965f743e1e731b5a7616cbd7b0551c416da327 /libavcodec/h264dsp.h | |
| parent | 06a9da736554197601e4062298fcf45a5e8d49ff (diff) | |
| parent | 8e112df409061034202b98fcc6ce2c1c670c0dda (diff) | |
| download | ffmpeg-streaming-cd8cb54990be4fbd23e28f9d7c2c6170d3667692.zip ffmpeg-streaming-cd8cb54990be4fbd23e28f9d7c2c6170d3667692.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ARM: ac3dsp: optimised update_bap_counts()
mpegaudiodec: Fix av_dlog() invocation.
h264/10bit: add HAVE_ALIGNED_STACK checks.
Update 8-bit H.264 IDCT function names to reflect bit-depth.
Add IDCT functions for 10-bit H.264.
mpegaudioenc: Fix broken av_dlog statement.
Employ correct printf format specifiers, mostly in debug output.
ARM: fix MUL64 inline asm for pre-armv6
Conflicts:
libavcodec/mpegaudioenc.c
libavformat/ape.c
libavformat/mxfdec.c
libavformat/r3d.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264dsp.h')
| -rw-r--r-- | libavcodec/h264dsp.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/h264dsp.h b/libavcodec/h264dsp.h index 4b606ef..6ed0b53 100644 --- a/libavcodec/h264dsp.h +++ b/libavcodec/h264dsp.h @@ -66,7 +66,6 @@ typedef struct H264DSPContext{ void (*h264_idct_dc_add)(uint8_t *dst/*align 4*/, DCTELEM *block/*align 16*/, int stride); void (*h264_idct8_dc_add)(uint8_t *dst/*align 8*/, DCTELEM *block/*align 16*/, int stride); - void (*h264_dct)(DCTELEM block[4][4]); void (*h264_idct_add16)(uint8_t *dst/*align 16*/, const int *blockoffset, DCTELEM *block/*align 16*/, int stride, const uint8_t nnzc[6*8]); void (*h264_idct8_add4)(uint8_t *dst/*align 16*/, const int *blockoffset, DCTELEM *block/*align 16*/, int stride, const uint8_t nnzc[6*8]); void (*h264_idct_add8)(uint8_t **dst/*align 16*/, const int *blockoffset, DCTELEM *block/*align 16*/, int stride, const uint8_t nnzc[6*8]); |
