diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-09 22:03:39 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-09 22:07:24 +0300 |
| commit | fe25194c5870f21ba10f615f036b64d0c84fca48 (patch) | |
| tree | ec4aa330575d647588e90d2201cc54d5d1b1c174 /libavdevice/vfwcap.c | |
| parent | 71288bf80f37bdc0795396930d8b97c781c94587 (diff) | |
| parent | c201069fac9a76e6604f9d84d76a172434d62200 (diff) | |
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/vfwcap.c')
| -rw-r--r-- | libavdevice/vfwcap.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c index 00fb48b516..7929ac835e 100644 --- a/libavdevice/vfwcap.c +++ b/libavdevice/vfwcap.c @@ -19,12 +19,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavformat/internal.h" +#include <vfw.h> +#include <windows.h> + +#include "libavutil/internal.h" #include "libavutil/log.h" #include "libavutil/opt.h" #include "libavutil/parseutils.h" -#include <windows.h> -#include <vfw.h> + +#include "libavformat/internal.h" + #include "avdevice.h" /* Some obsolete versions of MinGW32 before 4.0.0 lack this. */ |