[FFmpeg-cvslog] r20665 - in trunk/libavdevice: alsa-audio-common.c alsa-audio-dec.c alsa-audio-enc.c

[stefano]

Author: stefano
Date: Mon Nov 30 00:30:46 2009
New Revision: 20665

Log:
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 at free fr>.

Modified:
   trunk/libavdevice/alsa-audio-common.c
   trunk/libavdevice/alsa-audio-dec.c
   trunk/libavdevice/alsa-audio-enc.c

Modified: trunk/libavdevice/alsa-audio-common.c
==============================================================================
--- trunk/libavdevice/alsa-audio-common.c	Mon Nov 30 00:12:19 2009	(r20664)
+++ trunk/libavdevice/alsa-audio-common.c	Mon Nov 30 00:30:46 2009	(r20665)
@@ -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"
 

Modified: trunk/libavdevice/alsa-audio-dec.c
==============================================================================
--- trunk/libavdevice/alsa-audio-dec.c	Mon Nov 30 00:12:19 2009	(r20664)
+++ trunk/libavdevice/alsa-audio-dec.c	Mon Nov 30 00:30:46 2009	(r20665)
@@ -45,8 +45,8 @@
  * plugin.
  */
 
-#include "libavformat/avformat.h"
 #include <alsa/asoundlib.h>
+#include "libavformat/avformat.h"
 
 #include "alsa-audio.h"
 

Modified: trunk/libavdevice/alsa-audio-enc.c
==============================================================================
--- trunk/libavdevice/alsa-audio-enc.c	Mon Nov 30 00:12:19 2009	(r20664)
+++ trunk/libavdevice/alsa-audio-enc.c	Mon Nov 30 00:30:46 2009	(r20665)
@@ -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"