[FFmpeg-cvslog] libgsm: Set options on the right object

Martin Storsjö git at videolan.org
Fri Dec 16 01:32:11 CET 2011


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Wed Dec 14 22:14:28 2011 +0200| [8637af8d2499e72ad6662627dae9f245e3e961df] | committer: Martin Storsjö

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 at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8637af8d2499e72ad6662627dae9f245e3e961df
---

 libavcodec/libgsm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/libgsm.c b/libavcodec/libgsm.c
index 22629c6..7623d35 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;
         }



More information about the ffmpeg-cvslog mailing list