Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
c201069f
Commit
c201069f
authored
Apr 08, 2015
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avdevice: Add missing header for NULL_IF_CONFIG_SMALL
Also reshuffle headers into canonical order where appropriate.
parent
27852f2f
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
40 additions
and
19 deletions
+40
-19
alsa-audio-dec.c
libavdevice/alsa-audio-dec.c
+4
-1
alsa-audio-enc.c
libavdevice/alsa-audio-enc.c
+3
-0
jack_audio.c
libavdevice/jack_audio.c
+1
-0
libdc1394.c
libavdevice/libdc1394.c
+10
-7
pulse.c
libavdevice/pulse.c
+4
-2
sndio_dec.c
libavdevice/sndio_dec.c
+4
-2
sndio_enc.c
libavdevice/sndio_enc.c
+2
-0
vfwcap.c
libavdevice/vfwcap.c
+7
-4
x11grab.c
libavdevice/x11grab.c
+1
-0
xcbgrab.c
libavdevice/xcbgrab.c
+4
-3
No files found.
libavdevice/alsa-audio-dec.c
View file @
c201069f
...
@@ -46,9 +46,12 @@
...
@@ -46,9 +46,12 @@
*/
*/
#include <alsa/asoundlib.h>
#include <alsa/asoundlib.h>
#include "libavutil/internal.h"
#include "libavutil/opt.h"
#include "libavformat/avformat.h"
#include "libavformat/avformat.h"
#include "libavformat/internal.h"
#include "libavformat/internal.h"
#include "libavutil/opt.h"
#include "alsa-audio.h"
#include "alsa-audio.h"
...
...
libavdevice/alsa-audio-enc.c
View file @
c201069f
...
@@ -38,6 +38,9 @@
...
@@ -38,6 +38,9 @@
*/
*/
#include <alsa/asoundlib.h>
#include <alsa/asoundlib.h>
#include "libavutil/internal.h"
#include "libavformat/avformat.h"
#include "libavformat/avformat.h"
#include "alsa-audio.h"
#include "alsa-audio.h"
...
...
libavdevice/jack_audio.c
View file @
c201069f
...
@@ -24,6 +24,7 @@
...
@@ -24,6 +24,7 @@
#include <semaphore.h>
#include <semaphore.h>
#include <jack/jack.h>
#include <jack/jack.h>
#include "libavutil/internal.h"
#include "libavutil/log.h"
#include "libavutil/log.h"
#include "libavutil/fifo.h"
#include "libavutil/fifo.h"
#include "libavutil/opt.h"
#include "libavutil/opt.h"
...
...
libavdevice/libdc1394.c
View file @
c201069f
...
@@ -21,13 +21,6 @@
...
@@ -21,13 +21,6 @@
*/
*/
#include "config.h"
#include "config.h"
#include "libavformat/avformat.h"
#include "libavformat/internal.h"
#include "libavutil/log.h"
#include "libavutil/mathematics.h"
#include "libavutil/opt.h"
#include "libavutil/parseutils.h"
#include "libavutil/pixdesc.h"
#if HAVE_LIBDC1394_2
#if HAVE_LIBDC1394_2
#include <dc1394/dc1394.h>
#include <dc1394/dc1394.h>
...
@@ -35,6 +28,16 @@
...
@@ -35,6 +28,16 @@
#include <libraw1394/raw1394.h>
#include <libraw1394/raw1394.h>
#include <libdc1394/dc1394_control.h>
#include <libdc1394/dc1394_control.h>
#include "libavutil/internal.h"
#include "libavutil/log.h"
#include "libavutil/mathematics.h"
#include "libavutil/opt.h"
#include "libavutil/parseutils.h"
#include "libavutil/pixdesc.h"
#include "libavformat/avformat.h"
#include "libavformat/internal.h"
#define DC1394_VIDEO_MODE_320x240_YUV422 MODE_320x240_YUV422
#define DC1394_VIDEO_MODE_320x240_YUV422 MODE_320x240_YUV422
#define DC1394_VIDEO_MODE_640x480_YUV411 MODE_640x480_YUV411
#define DC1394_VIDEO_MODE_640x480_YUV411 MODE_640x480_YUV411
#define DC1394_VIDEO_MODE_640x480_YUV422 MODE_640x480_YUV422
#define DC1394_VIDEO_MODE_640x480_YUV422 MODE_640x480_YUV422
...
...
libavdevice/pulse.c
View file @
c201069f
...
@@ -29,10 +29,12 @@
...
@@ -29,10 +29,12 @@
#include <pulse/rtclock.h>
#include <pulse/rtclock.h>
#include <pulse/error.h>
#include <pulse/error.h>
#include "libavutil/internal.h"
#include "libavutil/opt.h"
#include "libavutil/time.h"
#include "libavformat/avformat.h"
#include "libavformat/avformat.h"
#include "libavformat/internal.h"
#include "libavformat/internal.h"
#include "libavutil/time.h"
#include "libavutil/opt.h"
#define DEFAULT_CODEC_ID AV_NE(AV_CODEC_ID_PCM_S16BE, AV_CODEC_ID_PCM_S16LE)
#define DEFAULT_CODEC_ID AV_NE(AV_CODEC_ID_PCM_S16BE, AV_CODEC_ID_PCM_S16LE)
...
...
libavdevice/sndio_dec.c
View file @
c201069f
...
@@ -22,11 +22,13 @@
...
@@ -22,11 +22,13 @@
#include <stdint.h>
#include <stdint.h>
#include <sndio.h>
#include <sndio.h>
#include "libavformat/avformat.h"
#include "libavutil/internal.h"
#include "libavformat/internal.h"
#include "libavutil/opt.h"
#include "libavutil/opt.h"
#include "libavutil/time.h"
#include "libavutil/time.h"
#include "libavformat/avformat.h"
#include "libavformat/internal.h"
#include "sndio_common.h"
#include "sndio_common.h"
static
av_cold
int
audio_read_header
(
AVFormatContext
*
s1
)
static
av_cold
int
audio_read_header
(
AVFormatContext
*
s1
)
...
...
libavdevice/sndio_enc.c
View file @
c201069f
...
@@ -22,6 +22,8 @@
...
@@ -22,6 +22,8 @@
#include <stdint.h>
#include <stdint.h>
#include <sndio.h>
#include <sndio.h>
#include "libavutil/internal.h"
#include "libavformat/avformat.h"
#include "libavformat/avformat.h"
#include "sndio_common.h"
#include "sndio_common.h"
...
...
libavdevice/vfwcap.c
View file @
c201069f
...
@@ -19,13 +19,16 @@
...
@@ -19,13 +19,16 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
*/
#include "libavformat/avformat.h"
#include <vfw.h>
#include "libavformat/internal.h"
#include <windows.h>
#include "libavutil/internal.h"
#include "libavutil/log.h"
#include "libavutil/log.h"
#include "libavutil/opt.h"
#include "libavutil/opt.h"
#include "libavutil/parseutils.h"
#include "libavutil/parseutils.h"
#include <windows.h>
#include <vfw.h>
#include "libavformat/avformat.h"
#include "libavformat/internal.h"
/* Some obsolete versions of MinGW32 before 4.0.0 lack this. */
/* Some obsolete versions of MinGW32 before 4.0.0 lack this. */
#ifndef HWND_MESSAGE
#ifndef HWND_MESSAGE
...
...
libavdevice/x11grab.c
View file @
c201069f
...
@@ -51,6 +51,7 @@
...
@@ -51,6 +51,7 @@
#include <X11/extensions/Xfixes.h>
#include <X11/extensions/Xfixes.h>
#include <X11/extensions/XShm.h>
#include <X11/extensions/XShm.h>
#include "libavutil/internal.h"
#include "libavutil/log.h"
#include "libavutil/log.h"
#include "libavutil/opt.h"
#include "libavutil/opt.h"
#include "libavutil/parseutils.h"
#include "libavutil/parseutils.h"
...
...
libavdevice/xcbgrab.c
View file @
c201069f
...
@@ -33,14 +33,15 @@
...
@@ -33,14 +33,15 @@
#include <xcb/shm.h>
#include <xcb/shm.h>
#endif
#endif
#include "libavformat/avformat.h"
#include "libavutil/internal.h"
#include "libavformat/internal.h"
#include "libavutil/mathematics.h"
#include "libavutil/mathematics.h"
#include "libavutil/opt.h"
#include "libavutil/opt.h"
#include "libavutil/parseutils.h"
#include "libavutil/parseutils.h"
#include "libavutil/time.h"
#include "libavutil/time.h"
#include "libavformat/avformat.h"
#include "libavformat/internal.h"
typedef
struct
XCBGrabContext
{
typedef
struct
XCBGrabContext
{
const
AVClass
*
class
;
const
AVClass
*
class
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment