diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-26 13:13:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-26 13:13:10 +0100 |
| commit | e907aa98cd27b52283927a8654091c2cd5ff2eeb (patch) | |
| tree | e53223229277b01e88f70ddaa2f7ccdc4ce4d423 /libavcodec/g726.c | |
| parent | a984efd104cc3f4ab7f7209fa1b1bab6a44720db (diff) | |
| parent | 3a02b6884cda9739100d974cae0d75276b2b44ed (diff) | |
| download | ffmpeg-e907aa98cd27b52283927a8654091c2cd5ff2eeb.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: icc: Drop nonsense adding of cpuflags to LDFLAGS
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g726.c')
0 files changed, 0 insertions, 0 deletions