From a11c9d77781b1bb5f94f5925de9896069d35a0cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Wed, 14 Dec 2011 22:14:28 +0200 Subject: [PATCH] libgsm: Set options on the right object MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes regressions in decoding using the libgsm_ms decoder, broken since 0eea21294354. Signed-off-by: Martin Storsjö (cherry picked from commit 8637af8d2499e72ad6662627dae9f245e3e961df) Signed-off-by: Michael Niedermayer --- libavcodec/libgsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/libgsm.c b/libavcodec/libgsm.c index 9ba9da9e3f..65b1911c79 100644 --- a/libavcodec/libgsm.c +++ b/libavcodec/libgsm.c @@ -155,7 +155,7 @@ static av_cold int libgsm_decode_init(AVCodecContext *avctx) { break; case CODEC_ID_GSM_MS: { int one = 1; - gsm_option(avctx->priv_data, GSM_OPT_WAV49, &one); + gsm_option(s->state, GSM_OPT_WAV49, &one); avctx->frame_size = 2 * GSM_FRAME_SIZE; avctx->block_align = GSM_MS_BLOCK_SIZE; }