OSDN Git Service

Merge commit 'ca488ad480360dfafcb5766f7bfbb567a0638979'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Jul 2013 08:28:38 +0000 (10:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Jul 2013 08:31:10 +0000 (10:31 +0200)
commita550926705fe29e1bc3c674ac302ef7912f02938
tree3c0925866b264e2ffdde4e6643ec2e1fbb419979
parent865f34823c57fcb1a42a744cc9f38959ec5b427b
parentca488ad480360dfafcb5766f7bfbb567a0638979
Merge commit 'ca488ad480360dfafcb5766f7bfbb567a0638979'

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

Conflicts:
libavcodec/alsdec.c

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