diff options
author | Matthieu Castet <castet.matthieu@free.fr> | 2009-11-29 23:30:46 +0000 |
---|---|---|
committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-11-29 23:30:46 +0000 |
commit | 419bddd36692ebdbba88089b9acb702639f2f0f1 (patch) | |
tree | e9d698fdb1c0a916fcf83a0419f9bbc102fbef04 /libavdevice | |
parent | 992f8eaee7080ab2e67cacd8851ca334f69156b3 (diff) | |
download | ffmpeg-streaming-419bddd36692ebdbba88089b9acb702639f2f0f1.zip ffmpeg-streaming-419bddd36692ebdbba88089b9acb702639f2f0f1.tar.gz |
Include alsa headers before the internal FFmpeg headers.
This avoids symbol redefinitions problems, for example avoids the "free"
symbol to be redefined before system headers actually using it are
included, thus breaking compilation. In particular this change allows
to build FFmpeg with salsa.
Patch by matthieu castet <$surname.mat?hieu@free fr>.
Originally committed as revision 20665 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavdevice')
-rw-r--r-- | libavdevice/alsa-audio-common.c | 2 | ||||
-rw-r--r-- | libavdevice/alsa-audio-dec.c | 2 | ||||
-rw-r--r-- | libavdevice/alsa-audio-enc.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libavdevice/alsa-audio-common.c b/libavdevice/alsa-audio-common.c index f1d78b0..e125b2d 100644 --- a/libavdevice/alsa-audio-common.c +++ b/libavdevice/alsa-audio-common.c @@ -28,8 +28,8 @@ * @author Nicolas George ( nicolas george normalesup org ) */ -#include "libavformat/avformat.h" #include <alsa/asoundlib.h> +#include "libavformat/avformat.h" #include "alsa-audio.h" diff --git a/libavdevice/alsa-audio-dec.c b/libavdevice/alsa-audio-dec.c index da6746c..4dac3f9 100644 --- a/libavdevice/alsa-audio-dec.c +++ b/libavdevice/alsa-audio-dec.c @@ -45,8 +45,8 @@ * plugin. */ -#include "libavformat/avformat.h" #include <alsa/asoundlib.h> +#include "libavformat/avformat.h" #include "alsa-audio.h" diff --git a/libavdevice/alsa-audio-enc.c b/libavdevice/alsa-audio-enc.c index 40eb5ba..a0b0144 100644 --- a/libavdevice/alsa-audio-enc.c +++ b/libavdevice/alsa-audio-enc.c @@ -37,8 +37,8 @@ * which gives a low latency suitable for real-time playback. */ -#include "libavformat/avformat.h" #include <alsa/asoundlib.h> +#include "libavformat/avformat.h" #include "alsa-audio.h" |