diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-03-02 17:11:25 -0500 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2012-03-04 21:26:29 +0100 |
| commit | 1128b10247739900174991b4e013429a1b8ceaa4 (patch) | |
| tree | 254696e0bd1a684fd581ac55c9f77b7241d2cbb1 /libavcodec | |
| parent | 6a073aa7a734d4fbad77071e9f8ee0fe75a17fae (diff) | |
| download | ffmpeg-1128b10247739900174991b4e013429a1b8ceaa4.tar.gz | |
wmaenc: fix m/s stereo encoding for the first frame
We need to set ms_stereo in encode_init() in order to avoid incorrectly
encoding the first frame as non-m/s while flagging it as m/s. Fixes an
uncomfortable pop in the left channel at the start of playback.
CC:libav-stable@libav.org
(cherry picked from commit 51ddf35c9017018e58c15275ff5b129647a0c94d)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/wmaenc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index 5135b982aa..df59cab6aa 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -70,6 +70,8 @@ static int encode_init(AVCodecContext * avctx){ s->use_exp_vlc = flags2 & 0x0001; s->use_bit_reservoir = flags2 & 0x0002; s->use_variable_block_len = flags2 & 0x0004; + if (avctx->channels == 2) + s->ms_stereo = 1; ff_wma_init(avctx, flags2); @@ -191,7 +193,7 @@ static int encode_block(WMACodecContext *s, float (*src_coefs)[BLOCK_MAX_SIZE], } if (s->nb_channels == 2) { - put_bits(&s->pb, 1, s->ms_stereo= 1); + put_bits(&s->pb, 1, !!s->ms_stereo); } for(ch = 0; ch < s->nb_channels; ch++) { |