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:
bb1d3f1
)
avcodec/adpcm: increase max channels for ADPCM PSX to 8
author
Paul B Mahol
<onemda@gmail.com>
Sun, 18 Oct 2015 12:10:26 +0000
(14:10 +0200)
committer
Paul B Mahol
<onemda@gmail.com>
Sun, 18 Oct 2015 12:17:15 +0000
(14:17 +0200)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
libavcodec/adpcm.c
patch
|
blob
|
history
diff --git
a/libavcodec/adpcm.c
b/libavcodec/adpcm.c
index
11eb974
..
2f632bd
100644
(file)
--- a/
libavcodec/adpcm.c
+++ b/
libavcodec/adpcm.c
@@
-107,6
+107,9
@@
static av_cold int adpcm_decode_init(AVCodecContext * avctx)
case AV_CODEC_ID_ADPCM_EA_XAS:
max_channels = 6;
break;
+ case AV_CODEC_ID_ADPCM_PSX:
+ max_channels = 8;
+ break;
case AV_CODEC_ID_ADPCM_THP:
case AV_CODEC_ID_ADPCM_THP_LE:
max_channels = 14;