Merge commit 'ca488ad4'

* commit 'ca488ad4': alsdec: Clean up error paths Conflicts: libavcodec/alsdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'ca488ad4'
* commit 'ca488ad4': alsdec: Clean up error paths Conflicts: libavcodec/alsdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
a5509267 · Michael Niedermayer · 865f3482 · ca488ad4 · a5509267
Commit a5509267 authored Jul 24, 2013 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 75 additions and 64 deletions

alsdec.c libavcodec/alsdec.c +75 -64

No files found.
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c