diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-24 10:28:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-24 10:31:10 +0200 |
| commit | a550926705fe29e1bc3c674ac302ef7912f02938 (patch) | |
| tree | 3c0925866b264e2ffdde4e6643ec2e1fbb419979 /common.mak | |
| parent | 865f34823c57fcb1a42a744cc9f38959ec5b427b (diff) | |
| parent | ca488ad480360dfafcb5766f7bfbb567a0638979 (diff) | |
| download | ffmpeg-a550926705fe29e1bc3c674ac302ef7912f02938.tar.gz | |
Merge commit 'ca488ad480360dfafcb5766f7bfbb567a0638979'
* commit 'ca488ad480360dfafcb5766f7bfbb567a0638979':
alsdec: Clean up error paths
Conflicts:
libavcodec/alsdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'common.mak')
0 files changed, 0 insertions, 0 deletions