Merge commit '70ecc175c7b513a153ac87d1c5d219556ca55070'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Jul 2013 08:15:50 +0000 (10:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Jul 2013 08:15:50 +0000 (10:15 +0200)
commit865f34823c57fcb1a42a744cc9f38959ec5b427b
tree3b8f1701a13b7b87a38052c833aa2668aa4d1804
parent6bab3430a775183f2f9acbd91d1376c71e87c026
parent70ecc175c7b513a153ac87d1c5d219556ca55070
Merge commit '70ecc175c7b513a153ac87d1c5d219556ca55070'

* commit '70ecc175c7b513a153ac87d1c5d219556ca55070':
  alsdec: Fix the clipping range

Conflicts:
libavcodec/alsdec.c

See: feaff427c0df015146f660199453bd8c0314e677

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/alsdec.c