diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-09 22:36:42 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-09 22:36:42 +0300 |
commit | b1b58310d09297eb8e64b156e6da3406bc866cce (patch) | |
tree | 9314f08b45e3e58b6afb667d4f30a05dabe497e0 /libavdevice/sndio_enc.c | |
parent | 259fd4c7cfb8afbb022921b44fe6611fcefff3b1 (diff) | |
parent | 8d26c193fb42d08602ac93ece039d4718d029adc (diff) |
Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'
* commit '8d26c193fb42d08602ac93ece039d4718d029adc':
avdevice: Apply a more consistent file naming scheme
Conflicts:
libavdevice/Makefile
libavdevice/alsa.h
libavdevice/alsa_dec.c
libavdevice/alsa_enc.c
libavdevice/sndio_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/sndio_enc.c')
-rw-r--r-- | libavdevice/sndio_enc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavdevice/sndio_enc.c b/libavdevice/sndio_enc.c index 2a24620e4b..52b9060ef6 100644 --- a/libavdevice/sndio_enc.c +++ b/libavdevice/sndio_enc.c @@ -25,8 +25,8 @@ #include "libavutil/internal.h" -#include "avdevice.h" -#include "sndio_common.h" +#include "libavdevice/avdevice.h" +#include "libavdevice/sndio.h" static av_cold int audio_write_header(AVFormatContext *s1) { |