mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
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:
parent
992f8eaee7
commit
419bddd366
@ -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…
Reference in New Issue
Block a user