diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-28 08:59:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-28 08:59:07 +0200 |
| commit | 3fc8500483bef4dcb43b4a1e5fe628e416ca1a0e (patch) | |
| tree | 733e987f3d178a93c4377871e00261600e7eba81 /libavcodec | |
| parent | 2ad28840b3fb90d9f000b676853846792e05bd68 (diff) | |
| parent | 268bb88544d9a5256992a9817e60972461359865 (diff) | |
| download | ffmpeg-3fc8500483bef4dcb43b4a1e5fe628e416ca1a0e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
smacker: add a clarification notice about audio decoding
configure: make jack depend on pthreads
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/smacker.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 8dd0f4dbf0..f06d60fabd 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -660,6 +660,7 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, } } } + /* this codec relies on wraparound instead of clipping audio */ if(bits) { //decode 16-bit data for(i = stereo; i >= 0; i--) pred[i] = sign_extend(av_bswap16(get_bits(&gb, 16)), 16); |