diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-28 10:08:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-28 10:08:43 +0200 |
| commit | 831e749bc926db2aea5f999529e176d18c832c82 (patch) | |
| tree | 195b63489c5cbe4880dc00e037b0bb11253edb98 /libavfilter | |
| parent | 1bcfb1eea836e3c357732ece6d96f5c87938b6d6 (diff) | |
| parent | 07c52e2c7c60b087fd023cd9771778973def0b33 (diff) | |
| download | ffmpeg-831e749bc926db2aea5f999529e176d18c832c82.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aac: return meaningful errors
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
0 files changed, 0 insertions, 0 deletions