diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-28 13:29:23 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-28 13:29:29 +0200 |
commit | 7fe88bc66c8d1a03a1a64a2bf9984bc173b203f1 (patch) | |
tree | 4f254865812166ec269b99abfca1098e3bd26743 /libavcodec/Makefile | |
parent | 333e708520a53df727d951a0672829d1d5414b07 (diff) | |
parent | 26605efed72e70edabc999e819961f9628450212 (diff) | |
download | ffmpeg-7fe88bc66c8d1a03a1a64a2bf9984bc173b203f1.tar.gz |
Merge remote-tracking branch 'qatar/release/9' into release/1.1
* qatar/release/9:
ac3: Return proper error codes
ac3: Clean up the error paths
ac3: Do not clash with normal AVERROR
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
0 files changed, 0 insertions, 0 deletions