diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-24 21:34:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-24 21:34:54 +0200 |
| commit | 244682dd086233b71e885d2fb1ec0dd3396b94bc (patch) | |
| tree | 6a314fbc579bad35bb666ee469d28e2b2872e57c /libavcodec | |
| parent | 5c44c2de8045ea0b9787a95053f542b1b3b860d2 (diff) | |
| parent | 145a8096d53c20da7898539e521e6d4267ab2f09 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
log: Only include unistd.h if configure found it
ape: create audio stream before reading tags.
mov: make a length variable larger.
image2: Add "start_number" private option to the demuxer
image2: Add "start_number" private option to the muxer
avconv: remove a forgotten debugging printf.
avconv: use more descriptive names for hardcoded filters.
avconv: remove redundant handling of async.
doc/filters: fix typo.
h264: use asm cabac reader under a generic condition
Conflicts:
ffmpeg.c
libavformat/img2dec.c
libavformat/img2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264_cabac.c | 6 | ||||
| -rw-r--r-- | libavcodec/x86/h264_i386.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index d85ebf5aa3..a409e951f9 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -1652,14 +1652,14 @@ decode_cabac_residual_internal(H264Context *h, DCTELEM *block, index[coeff_count++] = last;\ } const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD]; -#if ARCH_X86 && HAVE_7REGS - coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index, +#ifdef decode_significance + coeff_count = decode_significance_8x8(CC, significant_coeff_ctx_base, index, last_coeff_ctx_base, sig_off); } else { if (is_dc && chroma422) { // dc 422 DECODE_SIGNIFICANCE(7, sig_coeff_offset_dc[last], sig_coeff_offset_dc[last]); } else { - coeff_count= decode_significance_x86(CC, max_coeff, significant_coeff_ctx_base, index, + coeff_count = decode_significance(CC, max_coeff, significant_coeff_ctx_base, index, last_coeff_ctx_base-significant_coeff_ctx_base); } #else diff --git a/libavcodec/x86/h264_i386.h b/libavcodec/x86/h264_i386.h index 2a502b7c0b..da85f3c088 100644 --- a/libavcodec/x86/h264_i386.h +++ b/libavcodec/x86/h264_i386.h @@ -37,6 +37,7 @@ //FIXME use some macros to avoid duplicating get_cabac (cannot be done yet //as that would make optimization work hard) #if HAVE_7REGS +#define decode_significance decode_significance_x86 static int decode_significance_x86(CABACContext *c, int max_coeff, uint8_t *significant_coeff_ctx_base, int *index, x86_reg last_off){ @@ -105,6 +106,7 @@ static int decode_significance_x86(CABACContext *c, int max_coeff, return coeff_count; } +#define decode_significance_8x8 decode_significance_8x8_x86 static int decode_significance_8x8_x86(CABACContext *c, uint8_t *significant_coeff_ctx_base, int *index, uint8_t *last_coeff_ctx_base, const uint8_t *sig_off){ |