diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-19 22:47:31 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-19 22:47:40 +0100 |
commit | 61bc3d80e9d819a08111476d9301445aec7d9fff (patch) | |
tree | 180e2b10bd4a9b1f7422f285f8f86f2187d0c1b4 /libavresample/audio_mix_matrix.c | |
parent | 33f9b2436aab7020af0852f34654280e71b7b50f (diff) | |
parent | 0ec1642b60a5b1a4d913e2b9e3899173dff77e7a (diff) | |
download | ffmpeg-61bc3d80e9d819a08111476d9301445aec7d9fff.tar.gz |
Merge commit '0ec1642b60a5b1a4d913e2b9e3899173dff77e7a'
* commit '0ec1642b60a5b1a4d913e2b9e3899173dff77e7a':
cmdutils: don't log an error in opt_default().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/audio_mix_matrix.c')
0 files changed, 0 insertions, 0 deletions