diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-28 11:08:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-28 11:08:24 +0200 |
| commit | 8d4e934df94e7324d56a13abca22c3cc21f2ac7d (patch) | |
| tree | f5ba66b53aa36eb90e2450647f9b63d7e2cc9ba0 /libavfilter/af_aconvert.c | |
| parent | 107e9e44329aeec082740a50f7a0e906d9544292 (diff) | |
| parent | 0f3a0b24dd6f595feaa4526e52ffa7d05c3d7840 (diff) | |
| download | ffmpeg-8d4e934df94e7324d56a13abca22c3cc21f2ac7d.tar.gz | |
Merge commit '0f3a0b24dd6f595feaa4526e52ffa7d05c3d7840'
* commit '0f3a0b24dd6f595feaa4526e52ffa7d05c3d7840':
wavpack: add an error message to a failure.
wavpack: return 0 instead of samples count from decoding functions
Conflicts:
libavcodec/wavpack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_aconvert.c')
0 files changed, 0 insertions, 0 deletions