diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 00:57:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 00:57:23 +0200 |
| commit | 30394adc448276b1e8acf0161131c78cf41712e7 (patch) | |
| tree | 2e938fa3d1c5661252b0db93a747f6f538f6a5a8 /libavcodec/arm/rv40dsp_init_arm.c | |
| parent | f908e3ce92a69b902a8ddd3c3e888fd05a0a605e (diff) | |
| parent | 5ba83e90919cdeef38e2b5343b48f3f367292564 (diff) | |
| download | ffmpeg-30394adc448276b1e8acf0161131c78cf41712e7.tar.gz | |
Merge commit '5ba83e90919cdeef38e2b5343b48f3f367292564' into release/1.1
* commit '5ba83e90919cdeef38e2b5343b48f3f367292564':
wavpack: return meaningful errors
Conflicts:
libavcodec/wavpack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/rv40dsp_init_arm.c')
0 files changed, 0 insertions, 0 deletions