Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
884c5976
Commit
884c5976
authored
Feb 23, 2022
by
Martin Storsjö
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libavdevice: Split version.h
Signed-off-by:
Martin Storsjö
<
martin@martin.st
>
parent
4eb9232c
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
44 additions
and
9 deletions
+44
-9
cmdutils.c
fftools/cmdutils.c
+1
-0
ffprobe.c
fftools/ffprobe.c
+1
-0
Makefile
libavdevice/Makefile
+1
-0
avdevice.c
libavdevice/avdevice.c
+1
-0
avdevice.h
libavdevice/avdevice.h
+1
-1
version.h
libavdevice/version.h
+2
-8
version_major.h
libavdevice/version_major.h
+37
-0
No files found.
fftools/cmdutils.c
View file @
884c5976
...
...
@@ -35,6 +35,7 @@
#include "libavformat/version.h"
#include "libavfilter/avfilter.h"
#include "libavdevice/avdevice.h"
#include "libavdevice/version.h"
#include "libswscale/swscale.h"
#include "libswresample/swresample.h"
#include "libpostproc/postprocess.h"
...
...
fftools/ffprobe.c
View file @
884c5976
...
...
@@ -53,6 +53,7 @@
#include "libavutil/timecode.h"
#include "libavutil/timestamp.h"
#include "libavdevice/avdevice.h"
#include "libavdevice/version.h"
#include "libswscale/swscale.h"
#include "libswresample/swresample.h"
#include "libpostproc/postprocess.h"
...
...
libavdevice/Makefile
View file @
884c5976
...
...
@@ -3,6 +3,7 @@ DESC = FFmpeg device handling library
HEADERS
=
avdevice.h
\
version.h
\
version_major.h
\
OBJS
=
alldevices.o
\
avdevice.o
\
...
...
libavdevice/avdevice.c
View file @
884c5976
...
...
@@ -22,6 +22,7 @@
#include "avdevice.h"
#include "internal.h"
#include "config.h"
#include "version.h"
#include "libavutil/ffversion.h"
const
char
av_device_ffversion
[]
=
"FFmpeg version "
FFMPEG_VERSION
;
...
...
libavdevice/avdevice.h
View file @
884c5976
...
...
@@ -19,7 +19,7 @@
#ifndef AVDEVICE_AVDEVICE_H
#define AVDEVICE_AVDEVICE_H
#include "version.h"
#include "version
_major
.h"
/**
* @file
...
...
libavdevice/version.h
View file @
884c5976
...
...
@@ -27,7 +27,8 @@
#include "libavutil/version.h"
#define LIBAVDEVICE_VERSION_MAJOR 59
#include "version_major.h"
#define LIBAVDEVICE_VERSION_MINOR 5
#define LIBAVDEVICE_VERSION_MICRO 100
...
...
@@ -41,11 +42,4 @@
#define LIBAVDEVICE_IDENT "Lavd" AV_STRINGIFY(LIBAVDEVICE_VERSION)
/**
* FF_API_* defines may be placed below to indicate public API that will be
* dropped at a future version bump. The defines themselves are not part of
* the public API and may change, break or disappear at any time.
*/
#define FF_API_DEVICE_CAPABILITIES (LIBAVDEVICE_VERSION_MAJOR < 60)
#endif
/* AVDEVICE_VERSION_H */
libavdevice/version_major.h
0 → 100644
View file @
884c5976
/*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVDEVICE_VERSION_MAJOR_H
#define AVDEVICE_VERSION_MAJOR_H
/**
* @file
* @ingroup lavd
* Libavdevice version macros
*/
#define LIBAVDEVICE_VERSION_MAJOR 59
/**
* FF_API_* defines may be placed below to indicate public API that will be
* dropped at a future version bump. The defines themselves are not part of
* the public API and may change, break or disappear at any time.
*/
#define FF_API_DEVICE_CAPABILITIES (LIBAVDEVICE_VERSION_MAJOR < 60)
#endif
/* AVDEVICE_VERSION_MAJOR_H */
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