Commit 419bddd3 authored by Matthieu Castet's avatar Matthieu Castet Committed by Stefano Sabatini

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
parent 992f8eae
......@@ -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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment