diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-26 12:29:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-26 12:30:02 +0200 |
| commit | 4c57be124f42ff7e191453f6c482d567ecee8cda (patch) | |
| tree | 10aa04bdba6545f184471155daf4b66ea62ccc19 /libavcodec | |
| parent | b0458e62c8fc7830da9b096d851219177185e296 (diff) | |
| parent | b97f6ef956293fe06ae1e99bd295f42613081f37 (diff) | |
| download | ffmpeg-streaming-4c57be124f42ff7e191453f6c482d567ecee8cda.zip ffmpeg-streaming-4c57be124f42ff7e191453f6c482d567ecee8cda.tar.gz | |
Merge commit 'b97f6ef956293fe06ae1e99bd295f42613081f37'
* commit 'b97f6ef956293fe06ae1e99bd295f42613081f37':
pcm-dvd: Move a variable to a smaller scope
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/pcm-dvd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/pcm-dvd.c b/libavcodec/pcm-dvd.c index 9b4c40e..e4184a5 100644 --- a/libavcodec/pcm-dvd.c +++ b/libavcodec/pcm-dvd.c @@ -158,21 +158,21 @@ static void *pcm_dvd_decode_samples(AVCodecContext *avctx, const uint8_t *src, GetByteContext gb; int i; uint8_t t; - int samples; bytestream2_init(&gb, src, blocks * s->block_size); switch (avctx->bits_per_coded_sample) { - case 16: + case 16: { #if HAVE_BIGENDIAN bytestream2_get_buffer(&gb, dst16, blocks * s->block_size); dst16 += blocks * s->block_size / 2; #else - samples = blocks * avctx->channels; + int samples = blocks * avctx->channels; do { *dst16++ = bytestream2_get_be16u(&gb); } while (--samples); #endif return dst16; + } case 20: if (avctx->channels == 1) { do { |
