From 76c4a644eef92f1a15af11825486f5593bfb0051 Mon Sep 17 00:00:00 2001 From: Attila Kinali Date: Mon, 30 Nov 2009 10:25:20 +0000 Subject: [PATCH] Fix an issue uncovered by commit 20623: The init functions of mpc7 and mpc8 check whether the vlc has been initialized already and return early if this is the case (eg by calling init a second time). But avctx->sample_fmt and channel_layout is set after the vlc initialization, causing it not to be set on the second call of init. Move all manipulations of avctx before the initialization of the vlc, so that it is always set. Originally committed as revision 20668 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mpc7.c | 5 +++-- libavcodec/mpc8.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c index 614a418684..e80b8927f2 100644 --- a/libavcodec/mpc7.c +++ b/libavcodec/mpc7.c @@ -85,6 +85,9 @@ static av_cold int mpc7_decode_init(AVCodecContext * avctx) c->IS, c->MSS, c->gapless, c->lastframelen, c->maxbands); c->frames_to_skip = 0; + avctx->sample_fmt = SAMPLE_FMT_S16; + avctx->channel_layout = (avctx->channels==2) ? CH_LAYOUT_STEREO : CH_LAYOUT_MONO; + if(vlc_initialized) return 0; av_log(avctx, AV_LOG_DEBUG, "Initing VLC\n"); scfi_vlc.table = scfi_table; @@ -124,8 +127,6 @@ static av_cold int mpc7_decode_init(AVCodecContext * avctx) } } vlc_initialized = 1; - avctx->sample_fmt = SAMPLE_FMT_S16; - avctx->channel_layout = (avctx->channels==2) ? CH_LAYOUT_STEREO : CH_LAYOUT_MONO; return 0; } diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c index e1b3866b0b..379528e9bd 100644 --- a/libavcodec/mpc8.c +++ b/libavcodec/mpc8.c @@ -129,6 +129,9 @@ static av_cold int mpc8_decode_init(AVCodecContext * avctx) c->MSS = get_bits1(&gb); c->frames = 1 << (get_bits(&gb, 3) * 2); + avctx->sample_fmt = SAMPLE_FMT_S16; + avctx->channel_layout = (avctx->channels==2) ? CH_LAYOUT_STEREO : CH_LAYOUT_MONO; + if(vlc_initialized) return 0; av_log(avctx, AV_LOG_DEBUG, "Initing VLC\n"); @@ -219,8 +222,6 @@ static av_cold int mpc8_decode_init(AVCodecContext * avctx) &mpc8_q8_codes[i], 1, 1, INIT_VLC_USE_NEW_STATIC); } vlc_initialized = 1; - avctx->sample_fmt = SAMPLE_FMT_S16; - avctx->channel_layout = (avctx->channels==2) ? CH_LAYOUT_STEREO : CH_LAYOUT_MONO; return 0; }