[FFmpeg-cvslog] Merge commit 'ca488ad480360dfafcb5766f7bfbb567a0638979'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 24 10:28:38 2013 +0200| [a550926705fe29e1bc3c674ac302ef7912f02938] | committer: Michael Niedermayer

Merge commit 'ca488ad480360dfafcb5766f7bfbb567a0638979'

* commit 'ca488ad480360dfafcb5766f7bfbb567a0638979':
  alsdec: Clean up error paths

Conflicts:
	libavcodec/alsdec.c

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

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