diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-09 21:03:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-09 21:07:24 +0200 |
| commit | fe25194c5870f21ba10f615f036b64d0c84fca48 (patch) | |
| tree | ec4aa330575d647588e90d2201cc54d5d1b1c174 /libavdevice/pulse_audio_dec.c | |
| parent | 71288bf80f37bdc0795396930d8b97c781c94587 (diff) | |
| parent | c201069fac9a76e6604f9d84d76a172434d62200 (diff) | |
| download | ffmpeg-streaming-fe25194c5870f21ba10f615f036b64d0c84fca48.zip ffmpeg-streaming-fe25194c5870f21ba10f615f036b64d0c84fca48.tar.gz | |
Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200'
* commit 'c201069fac9a76e6604f9d84d76a172434d62200':
avdevice: Add missing header for NULL_IF_CONFIG_SMALL
Conflicts:
libavdevice/alsa-audio-dec.c
libavdevice/alsa-audio-enc.c
libavdevice/pulse_audio_dec.c
libavdevice/sndio_enc.c
libavdevice/vfwcap.c
libavdevice/x11grab.c
libavdevice/xcbgrab.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/pulse_audio_dec.c')
| -rw-r--r-- | libavdevice/pulse_audio_dec.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavdevice/pulse_audio_dec.c b/libavdevice/pulse_audio_dec.c index 3cd0087..aa0800b 100644 --- a/libavdevice/pulse_audio_dec.c +++ b/libavdevice/pulse_audio_dec.c @@ -23,10 +23,13 @@ #include <pulse/rtclock.h> #include <pulse/error.h> -#include "libavformat/avformat.h" -#include "libavformat/internal.h" + +#include "libavutil/internal.h" #include "libavutil/opt.h" #include "libavutil/time.h" + +#include "libavformat/avformat.h" +#include "libavformat/internal.h" #include "pulse_audio_common.h" #include "timefilter.h" |
