[FFmpeg-cvslog] Merge commit '70ecc175c7b513a153ac87d1c5d219556ca55070'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 24 10:15:50 2013 +0200| [865f34823c57fcb1a42a744cc9f38959ec5b427b] | committer: Michael Niedermayer

Merge commit '70ecc175c7b513a153ac87d1c5d219556ca55070'

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

Conflicts:
	libavcodec/alsdec.c

See: feaff427c0df015146f660199453bd8c0314e677

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=865f34823c57fcb1a42a744cc9f38959ec5b427b
---