diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-20 20:33:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-20 20:33:27 +0100 |
| commit | 215c2fe0ae2a5105439c7abb484bc0ef1fc22934 (patch) | |
| tree | b270e219fca32d3d69bf28ea94336dc6430cae58 /libavcodec/metasound_data.c | |
| parent | 50255b7a865f0dd4fecf8d1e337f96b92b4b406e (diff) | |
| parent | 22a6d48b0d7367b3a45dd6db245f8ffaaa364995 (diff) | |
Merge commit '22a6d48b0d7367b3a45dd6db245f8ffaaa364995'
* commit '22a6d48b0d7367b3a45dd6db245f8ffaaa364995':
avconv: Print the avfilter errors
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/metasound_data.c')
0 files changed, 0 insertions, 0 deletions