aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2011-12-14 22:14:28 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-01-03 18:18:39 +0100
commita11c9d77781b1bb5f94f5925de9896069d35a0cc (patch)
tree4f76435ce6987e684ae7fa4685c66a891ac7df0b
parent1d23f5bbefa843a912873d3aa778358f6847e279 (diff)
downloadffmpeg-a11c9d77781b1bb5f94f5925de9896069d35a0cc.tar.gz
libgsm: Set options on the right object
This fixes regressions in decoding using the libgsm_ms decoder, broken since 0eea21294354. Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 8637af8d2499e72ad6662627dae9f245e3e961df) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/libgsm.c2
1 files changed, 1 insertions, 1 deletions
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;
}