Skip to content

Commit

Permalink
libavfilter: Split version.h
Browse files Browse the repository at this point in the history
Signed-off-by: Martin Storsjö <martin@martin.st>
  • Loading branch information
mstorsjo committed Mar 16, 2022
1 parent 6cd2ac3 commit 288313a
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 12 deletions.
1 change: 1 addition & 0 deletions fftools/cmdutils.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include "libavformat/avformat.h"
#include "libavformat/version.h"
#include "libavfilter/avfilter.h"
#include "libavfilter/version.h"
#include "libavdevice/avdevice.h"
#include "libavdevice/version.h"
#include "libswscale/swscale.h"
Expand Down
1 change: 1 addition & 0 deletions fftools/ffprobe.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
#include "libswresample/version.h"
#include "libpostproc/postprocess.h"
#include "libpostproc/version.h"
#include "libavfilter/version.h"
#include "cmdutils.h"

#include "libavutil/thread.h"
Expand Down
1 change: 1 addition & 0 deletions libavfilter/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ HEADERS = avfilter.h \
buffersink.h \
buffersrc.h \
version.h \
version_major.h \

OBJS = allfilters.o \
audio.o \
Expand Down
1 change: 1 addition & 0 deletions libavfilter/avfilter.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#include "formats.h"
#include "framepool.h"
#include "internal.h"
#include "version.h"

#include "libavutil/ffversion.h"
const char av_filter_ffversion[] = "FFmpeg version " FFMPEG_VERSION;
Expand Down
2 changes: 1 addition & 1 deletion libavfilter/avfilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
#include "libavutil/pixfmt.h"
#include "libavutil/rational.h"

#include "libavfilter/version.h"
#include "libavfilter/version_major.h"

/**
* Return the LIBAVFILTER_VERSION_INT constant.
Expand Down
13 changes: 2 additions & 11 deletions libavfilter/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@

#include "libavutil/version.h"

#define LIBAVFILTER_VERSION_MAJOR 8
#include "version_major.h"

#define LIBAVFILTER_VERSION_MINOR 28
#define LIBAVFILTER_VERSION_MICRO 100

Expand All @@ -44,14 +45,4 @@

#define LIBAVFILTER_IDENT "Lavfi" AV_STRINGIFY(LIBAVFILTER_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_SWS_PARAM_OPTION (LIBAVFILTER_VERSION_MAJOR < 9)
#define FF_API_BUFFERSINK_ALLOC (LIBAVFILTER_VERSION_MAJOR < 9)
#define FF_API_PAD_COUNT (LIBAVFILTER_VERSION_MAJOR < 9)

#endif /* AVFILTER_VERSION_H */
42 changes: 42 additions & 0 deletions libavfilter/version_major.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/*
* Version macros.
*
* 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 AVFILTER_VERSION_MAJOR_H
#define AVFILTER_VERSION_MAJOR_H

/**
* @file
* @ingroup lavfi
* Libavfilter version macros
*/

#define LIBAVFILTER_VERSION_MAJOR 8

/**
* 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_SWS_PARAM_OPTION (LIBAVFILTER_VERSION_MAJOR < 9)
#define FF_API_BUFFERSINK_ALLOC (LIBAVFILTER_VERSION_MAJOR < 9)
#define FF_API_PAD_COUNT (LIBAVFILTER_VERSION_MAJOR < 9)

#endif /* AVFILTER_VERSION_MAJOR_H */

0 comments on commit 288313a

Please sign in to comment.