repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.0~trusty1.1
[deb_ffmpeg.git]
/
ffmpeg
/
libavcodec
/
pcm-dvd.c
diff --git
a/ffmpeg/libavcodec/pcm-dvd.c
b/ffmpeg/libavcodec/pcm-dvd.c
index 9b4c40ee2240d465daddb98609b8b50dadba5aac..e4184a5d3f39ebe9c212f8c4ac3ea45e0cb5c436 100644
(file)
--- a/
ffmpeg/libavcodec/pcm-dvd.c
+++ b/
ffmpeg/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;
GetByteContext gb;
int i;
uint8_t t;
- int samples;
bytestream2_init(&gb, src, blocks * s->block_size);
switch (avctx->bits_per_coded_sample) {
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
#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;
do {
*dst16++ = bytestream2_get_be16u(&gb);
} while (--samples);
#endif
return dst16;
+ }
case 20:
if (avctx->channels == 1) {
do {
case 20:
if (avctx->channels == 1) {
do {