diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-04 10:33:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-04 10:33:50 +0200 |
| commit | 23a7c32a7ade12044c600aa48966829c53dcc836 (patch) | |
| tree | 8e5fd9fad7eceefd96095525b47af077cef4cf38 /libavcodec | |
| parent | 0104570fb65bef9986a630e0188b3756295693a9 (diff) | |
| parent | 69467fb64ba4972c7aa436ded2468bb32df9fa97 (diff) | |
| download | ffmpeg-23a7c32a7ade12044c600aa48966829c53dcc836.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
wav: return meaningful errors
Conflicts:
libavformat/wavdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions