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
release/0.6
Matthieu Castet 15 years ago committed by Stefano Sabatini
parent 992f8eaee7
commit 419bddd366
  1. 2
      libavdevice/alsa-audio-common.c
  2. 2
      libavdevice/alsa-audio-dec.c
  3. 2
      libavdevice/alsa-audio-enc.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"

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

@ -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"

Loading…
Cancel
Save