diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-17 23:16:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-17 23:16:05 +0100 |
| commit | 967bdb8572f27b9891fe7bd9b8489146a906633d (patch) | |
| tree | 61b486be897a4503f71e2ecc7734f16930dc1a94 /libavcodec/wmaenc.c | |
| parent | 219a6fb61cb9e6f534f20dc3313442f89b0ffd42 (diff) | |
| parent | 6ca3b248e21fc48418c4221fc92c2eecaf07cb9b (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
resample: allocate a large enough output buffer
fate: fix enc_dec_pcm tests with remote target
wmaenc: remove bit-exact hack
FATE: remove WMA acodec tests
FATE: add WMAv1 and WMAv2 encode/decode tests with fuzzy comparison
FATE: add AC-3 and E-AC-3 encode/decode tests with fuzzy comparison
qtrle: Use bytestream2 functions to prevent buffer overreads.
vqavideo: check malloc return values
x11grab: fix a memory leak exposed by valgrind
threads: fix old frames returned after avcodec_flush_buffers()
MPV: always mark dummy frames as reference
h264: fix deadlocks on incomplete reference frame decoding.
mpeg4: report frame decoding completion at ff_MPV_frame_end().
mimic: don't use self as reference, and report completion at end of decode().
Conflicts:
libavcodec/h264.c
libavcodec/qtrle.c
libavcodec/resample.c
libavcodec/vqavideo.c
libavdevice/x11grab.c
tests/ref/seek/wmav1_asf
tests/ref/seek/wmav2_asf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmaenc.c')
| -rw-r--r-- | libavcodec/wmaenc.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index 0674ca0cc9..019176a6d4 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -307,10 +307,6 @@ static int encode_block(WMACodecContext *s, float (*src_coefs)[BLOCK_MAX_SIZE], if(1<<coef_nb_bits <= abs_level) return -1; - - //Workaround minor rounding differences for the regression tests, FIXME we should find and replace the problematic float by fixpoint for reg tests - if(abs_level == 0x71B && (s->avctx->flags & CODEC_FLAG_BITEXACT)) abs_level=0x71A; - put_bits(&s->pb, coef_nb_bits, abs_level); put_bits(&s->pb, s->frame_len_bits, run); } |