Skip to content

Commit fe25194

Browse files
michaelnimichaelni
committed
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 <[email protected]>
2 parents 71288bf + c201069 commit fe25194

File tree

10 files changed

+45
-21
lines changed

10 files changed

+45
-21
lines changed

‎libavdevice/alsa-audio-dec.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,14 @@
4646
*/
4747

4848
#include <alsa/asoundlib.h>
49-
#include "libavformat/internal.h"
50-
#include "libavutil/opt.h"
49+
50+
#include "libavutil/internal.h"
5151
#include "libavutil/mathematics.h"
52+
#include "libavutil/opt.h"
5253
#include "libavutil/time.h"
5354

55+
#include "libavformat/internal.h"
56+
5457
#include "avdevice.h"
5558
#include "alsa-audio.h"
5659

‎libavdevice/alsa-audio-enc.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@
3939

4040
#include <alsa/asoundlib.h>
4141

42+
#include "libavutil/internal.h"
4243
#include "libavutil/time.h"
44+
45+
4346
#include "libavformat/internal.h"
4447
#include "avdevice.h"
4548
#include "alsa-audio.h"

‎libavdevice/jack_audio.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include <semaphore.h>
2525
#include <jack/jack.h>
2626

27+
#include "libavutil/internal.h"
2728
#include "libavutil/log.h"
2829
#include "libavutil/fifo.h"
2930
#include "libavutil/opt.h"

‎libavdevice/libdc1394.c

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@
2121
*/
2222

2323
#include "config.h"
24-
#include "libavformat/avformat.h"
25-
#include "libavformat/internal.h"
26-
#include "libavutil/log.h"
27-
#include "libavutil/mathematics.h"
28-
#include "libavutil/opt.h"
29-
#include "libavutil/parseutils.h"
30-
#include "libavutil/pixdesc.h"
3124

3225
#if HAVE_LIBDC1394_2
3326
#include <dc1394/dc1394.h>
@@ -48,6 +41,16 @@
4841
#define DC1394_FRAMERATE_240 FRAMERATE_240
4942
#endif
5043

44+
#include "libavutil/internal.h"
45+
#include "libavutil/log.h"
46+
#include "libavutil/mathematics.h"
47+
#include "libavutil/opt.h"
48+
#include "libavutil/parseutils.h"
49+
#include "libavutil/pixdesc.h"
50+
51+
#include "libavformat/avformat.h"
52+
#include "libavformat/internal.h"
53+
5154
typedef struct dc1394_data {
5255
AVClass *class;
5356
#if HAVE_LIBDC1394_1

‎libavdevice/pulse_audio_dec.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,13 @@
2323

2424
#include <pulse/rtclock.h>
2525
#include <pulse/error.h>
26-
#include "libavformat/avformat.h"
27-
#include "libavformat/internal.h"
26+
27+
#include "libavutil/internal.h"
2828
#include "libavutil/opt.h"
2929
#include "libavutil/time.h"
30+
31+
#include "libavformat/avformat.h"
32+
#include "libavformat/internal.h"
3033
#include "pulse_audio_common.h"
3134
#include "timefilter.h"
3235

‎libavdevice/sndio_dec.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@
2222
#include <stdint.h>
2323
#include <sndio.h>
2424

25-
#include "libavformat/avformat.h"
26-
#include "libavformat/internal.h"
25+
#include "libavutil/internal.h"
2726
#include "libavutil/opt.h"
2827
#include "libavutil/time.h"
2928

29+
#include "libavformat/avformat.h"
30+
#include "libavformat/internal.h"
31+
3032
#include "sndio_common.h"
3133

3234
static av_cold int audio_read_header(AVFormatContext *s1)

‎libavdevice/sndio_enc.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
#include <stdint.h>
2323
#include <sndio.h>
2424

25+
#include "libavutil/internal.h"
26+
27+
2528
#include "avdevice.h"
2629
#include "sndio_common.h"
2730

‎libavdevice/vfwcap.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,16 @@
1919
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2020
*/
2121

22-
#include "libavformat/internal.h"
22+
#include <vfw.h>
23+
#include <windows.h>
24+
25+
#include "libavutil/internal.h"
2326
#include "libavutil/log.h"
2427
#include "libavutil/opt.h"
2528
#include "libavutil/parseutils.h"
26-
#include <windows.h>
27-
#include <vfw.h>
29+
30+
#include "libavformat/internal.h"
31+
2832
#include "avdevice.h"
2933

3034
/* Some obsolete versions of MinGW32 before 4.0.0 lack this. */

‎libavdevice/x11grab.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,16 @@
5252
#include <X11/extensions/Xfixes.h>
5353
#include <X11/extensions/XShm.h>
5454

55-
#include "avdevice.h"
56-
55+
#include "libavutil/internal.h"
5756
#include "libavutil/log.h"
5857
#include "libavutil/opt.h"
5958
#include "libavutil/parseutils.h"
6059
#include "libavutil/time.h"
6160

6261
#include "libavformat/internal.h"
6362

63+
#include "avdevice.h"
64+
6465
/** X11 device demuxer context */
6566
typedef struct X11GrabContext {
6667
const AVClass *class; /**< Class for private options. */

‎libavdevice/xcbgrab.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,15 @@
3737
#include <xcb/shape.h>
3838
#endif
3939

40-
#include "libavformat/avformat.h"
41-
#include "libavformat/internal.h"
42-
40+
#include "libavutil/internal.h"
4341
#include "libavutil/mathematics.h"
4442
#include "libavutil/opt.h"
4543
#include "libavutil/parseutils.h"
4644
#include "libavutil/time.h"
4745

46+
#include "libavformat/avformat.h"
47+
#include "libavformat/internal.h"
48+
4849
typedef struct XCBGrabContext {
4950
const AVClass *class;
5051

0 commit comments

Comments
 (0)