diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-24 04:08:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-24 04:35:08 +0200 |
| commit | 26ed595bd0e66c6982515988de0d858bc56d2362 (patch) | |
| tree | 8f56bf6055109a5948cbe34c8f059846de60f48c /libavcodec | |
| parent | 1bc81bf981552ec542e14af194cd05d7c74a83e1 (diff) | |
| parent | a7a187a1beb8551101b592bf85f0f31a0db22f61 (diff) | |
| download | ffmpeg-26ed595bd0e66c6982515988de0d858bc56d2362.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Add -U__STRICT_ANSI__ to CPPFLAGS on Cygwin and DOS.
aacdec: fix typo in scalefactor clipping check
fate: fix fate-h264-conformance-frext-pph10i4-panasonic-a crcs.
fate: update 9/10bit refs.
h264: Properly set coded_{width, height} when parsing H.264.
x86 asm: Add SECTION_TEXT to dct32_sse.asm.
Fix 9/10 bit in swscale.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aacdec.c | 2 | ||||
| -rw-r--r-- | libavcodec/h264.c | 3 | ||||
| -rw-r--r-- | libavcodec/x86/dct32_sse.asm | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 34752b26e5..c56c0af986 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -824,7 +824,7 @@ static int decode_scalefactors(AACContext *ac, float sf[120], GetBitContext *gb, else offset[1] += get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60; clipped_offset = av_clip(offset[1], -100, 155); - if (offset[2] != clipped_offset) { + if (offset[1] != clipped_offset) { av_log_ask_for_sample(ac->avctx, "Noise gain clipped " "(%d -> %d).\nIf you heard an audible " "artifact, there may be a bug in the decoder. ", diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 3a1f821d04..02152ad621 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1901,6 +1901,9 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ s->avctx->sample_aspect_ratio= h->sps.sar; av_assert0(s->avctx->sample_aspect_ratio.den); + h->s.avctx->coded_width = 16*s->mb_width; + h->s.avctx->coded_height = 16*s->mb_height; + if(h->sps.video_signal_type_present_flag){ s->avctx->color_range = h->sps.full_range ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG; if(h->sps.colour_description_present_flag){ diff --git a/libavcodec/x86/dct32_sse.asm b/libavcodec/x86/dct32_sse.asm index 86cf912be3..7f5f815591 100644 --- a/libavcodec/x86/dct32_sse.asm +++ b/libavcodec/x86/dct32_sse.asm @@ -203,7 +203,7 @@ ps_p1p1m1m1: dd 0, 0, 0x80000000, 0x80000000, 0, 0, 0x80000000, 0x80000000 %define BUTTERFLY0 BUTTERFLY0_AVX INIT_YMM -section .text align=16 +SECTION_TEXT %ifdef HAVE_AVX ; void ff_dct32_float_avx(FFTSample *out, const FFTSample *in) cglobal dct32_float_avx, 2,3,8, out, in, tmp |