GitList

Browse code

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

Attila Kinali authored on 2009/11/30 19:25:20
Showing 2 changed files

libavcodec/mpc7.c index 614a418..e80b892 100644
libavcodec/mpc8.c index e1b3866..379528e 100644

libavcodec/mpc7.c

History View file @ 76c4a64

@@ -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;
+                     }

libavcodec/mpc8.c

History View file @ 76c4a64

@@ -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;
+                     }