RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Matthieu Castet 2009-11-29 23:30:46 +00:00 committed by Stefano Sabatini
parent 992f8eaee7
commit 419bddd366
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavdevice/alsa-audio-common.c
View File

@ -28,8 +28,8 @@
* @author Nicolas George ( nicolas george normalesup org ) * @author Nicolas George ( nicolas george normalesup org )
*/ */
#include "libavformat/avformat.h"
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#include "libavformat/avformat.h"
#include "alsa-audio.h" #include "alsa-audio.h"

2
libavdevice/alsa-audio-dec.c
View File

@ -45,8 +45,8 @@
* plugin. * plugin.
*/ */
#include "libavformat/avformat.h"
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#include "libavformat/avformat.h"
#include "alsa-audio.h" #include "alsa-audio.h"

2
libavdevice/alsa-audio-enc.c
View File

@ -37,8 +37,8 @@
* which gives a low latency suitable for real-time playback. * which gives a low latency suitable for real-time playback.
*/ */
#include "libavformat/avformat.h"
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#include "libavformat/avformat.h"
#include "alsa-audio.h" #include "alsa-audio.h"