diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 16:34:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 16:34:37 +0100 |
| commit | f6a80d6e6318e929d22738c0f0ead30bb3ea28da (patch) | |
| tree | bd148fe9f2b84dff03f2ff814044b4d8f8ac3682 /libavcodec/libgsm.c | |
| parent | cf4515ecd985aab899f24a6b7d18432001e670fa (diff) | |
| parent | 9f00b1cbababa08dd220dbc0c74286a4707be746 (diff) | |
| download | ffmpeg-f6a80d6e6318e929d22738c0f0ead30bb3ea28da.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputilenc: x86: Convert pixel inline asm to yasm
libgsm: detect libgsm header path
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libgsm.c')
| -rw-r--r-- | libavcodec/libgsm.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/libgsm.c b/libavcodec/libgsm.c index f3cfb91f17..fd476e02e2 100644 --- a/libavcodec/libgsm.c +++ b/libavcodec/libgsm.c @@ -27,7 +27,12 @@ // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html +#include "config.h" +#if HAVE_GSM_H +#include <gsm.h> +#else #include <gsm/gsm.h> +#endif #include "libavutil/channel_layout.h" #include "libavutil/common.h" |