diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-08 23:36:59 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-08 23:37:14 +0100 |
commit | ac4447b6ec4e2dd1dc9d0432241cf5a63c3b54e6 (patch) | |
tree | 532887296f376eaab7a806663e4a11de9496db6f /libavresample/Makefile | |
parent | a26e83da6c96d21b18668f0a00e6627172f43722 (diff) | |
parent | 5462dde1947e0ecfcb2db99ae29ce9dee8933b45 (diff) | |
download | ffmpeg-ac4447b6ec4e2dd1dc9d0432241cf5a63c3b54e6.tar.gz |
Merge commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45'
* commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45':
metasound: Fix error message argument
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/Makefile')
0 files changed, 0 insertions, 0 deletions