OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f7de523
)
libgsm: Set options on the right object
author
Martin Storsjö
<martin@martin.st>
Wed, 14 Dec 2011 20:14:28 +0000
(22:14 +0200)
committer
Martin Storsjö
<martin@martin.st>
Thu, 15 Dec 2011 07:08:21 +0000
(09:08 +0200)
This fixes regressions in decoding using the libgsm_ms decoder,
broken since
0eea21294354
.
Signed-off-by: Martin Storsjö <martin@martin.st>
libavcodec/libgsm.c
patch
|
blob
|
history
diff --git
a/libavcodec/libgsm.c
b/libavcodec/libgsm.c
index
22629c6
..
7623d35
100644
(file)
--- 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;
}