diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 03:05:13 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 03:05:13 +0100 |
| commit | 1d0b3b20c34517b9d1ddf3ea347776304b0c4b44 (patch) | |
| tree | 89f4fc640c2becc6f00ae08996754952ecf149c1 /contrib/ffmpeg/libavcodec/sonic.c | |
| parent | 09496ad3469a0ade8dbd9a351e639b78f20b7942 (diff) | |
| download | xine-lib-1d0b3b20c34517b9d1ddf3ea347776304b0c4b44.tar.gz xine-lib-1d0b3b20c34517b9d1ddf3ea347776304b0c4b44.tar.bz2 | |
Update internal FFmpeg copy.
Diffstat (limited to 'contrib/ffmpeg/libavcodec/sonic.c')
| -rw-r--r-- | contrib/ffmpeg/libavcodec/sonic.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/contrib/ffmpeg/libavcodec/sonic.c b/contrib/ffmpeg/libavcodec/sonic.c index f3388589b..9e193d469 100644 --- a/contrib/ffmpeg/libavcodec/sonic.c +++ b/contrib/ffmpeg/libavcodec/sonic.c @@ -851,7 +851,7 @@ static int sonic_decode_close(AVCodecContext *avctx) static int sonic_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - uint8_t *buf, int buf_size) + const uint8_t *buf, int buf_size) { SonicContext *s = avctx->priv_data; GetBitContext gb; @@ -926,14 +926,7 @@ static int sonic_decode_frame(AVCodecContext *avctx, // internal -> short for (i = 0; i < s->frame_size; i++) - { - if (s->int_samples[i] > 32767) - samples[i] = 32767; - else if (s->int_samples[i] < -32768) - samples[i] = -32768; - else - samples[i] = s->int_samples[i]; - } + samples[i] = av_clip_int16(s->int_samples[i]); align_get_bits(&gb); |