diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-13 21:43:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-13 21:45:53 +0100 |
| commit | 7373b3ad043cc3417d80c55ccdb620b08cd271bf (patch) | |
| tree | d09b154daf25d8ec0136d3c88263c5ce1950fc56 /libavcodec/pcm.c | |
| parent | eab022d863c8505ce7786c82f0e0c3a8f4eeb4bd (diff) | |
| download | ffmpeg-7373b3ad043cc3417d80c55ccdb620b08cd271bf.tar.gz | |
pcmdec: consistently use codec_id, fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pcm.c')
| -rw-r--r-- | libavcodec/pcm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index 47a55091b3..ddb05bce36 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -211,7 +211,7 @@ static av_cold int pcm_decode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } - switch (avctx->codec->id) { + switch (avctx->codec_id) { case AV_CODEC_ID_PCM_ALAW: for (i = 0; i < 256; i++) s->table[i] = alaw2linear(i); @@ -227,7 +227,7 @@ static av_cold int pcm_decode_init(AVCodecContext *avctx) avctx->sample_fmt = avctx->codec->sample_fmts[0]; if (avctx->sample_fmt == AV_SAMPLE_FMT_S32) - avctx->bits_per_raw_sample = av_get_bits_per_sample(avctx->codec->id); + avctx->bits_per_raw_sample = av_get_bits_per_sample(avctx->codec_id); avcodec_get_frame_defaults(&s->frame); avctx->coded_frame = &s->frame; @@ -315,7 +315,7 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data, } samples = s->frame.data[0]; - switch (avctx->codec->id) { + switch (avctx->codec_id) { case AV_CODEC_ID_PCM_U32LE: DECODE(32, le32, src, samples, n, 0, 0x80000000) break; |