706bd8ea19
* qatar/master: (35 commits) h264_idct_10bit: port x86 assembly to cpuflags. x86inc: clip num_args to 7 on x86-32. x86inc: sync to latest version from x264. fft: rename "z" to "zc" to prevent name collision. wv: return meaningful error codes. wv: return AVERROR_EOF on EOF, not EIO. mp3dec: forward errors for av_get_packet(). mp3dec: remove a pointless local variable. mp3dec: remove commented out cruft. lavfi: bump minor to mark stabilizing the ABI. FATE: add tests for yadif. FATE: add a test for delogo video filter. FATE: add a test for amix audio filter. audiogen: allow specifying random seed as a commandline parameter. vc1dec: Override invalid macroblock quantizer vc1: avoid reading beyond the last line in vc1_draw_sprites() vc1dec: check that coded slice positions and interlacing match. vc1dec: Do not ignore ff_vc1_parse_frame_header_adv return value configure: Move parts that should not be user-selectable to CONFIG_EXTRA lavf: remove commented out cruft in avformat_find_stream_info() ... Conflicts: Makefile configure libavcodec/vc1dec.c libavcodec/x86/h264_deblock.asm libavcodec/x86/h264_deblock_10bit.asm libavcodec/x86/h264dsp_mmx.c libavfilter/version.h libavformat/mp3dec.c libavformat/utils.c libavformat/wv.c libavutil/x86/x86inc.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
66 lines
2.3 KiB
C
66 lines
2.3 KiB
C
/*
|
|
* 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_H
|
|
#define AVFILTER_VERSION_H
|
|
|
|
/**
|
|
* @file
|
|
* Libavfilter version macros
|
|
*/
|
|
|
|
#include "libavutil/avutil.h"
|
|
|
|
#define LIBAVFILTER_VERSION_MAJOR 3
|
|
#define LIBAVFILTER_VERSION_MINOR 5
|
|
#define LIBAVFILTER_VERSION_MICRO 100
|
|
|
|
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
|
|
LIBAVFILTER_VERSION_MINOR, \
|
|
LIBAVFILTER_VERSION_MICRO)
|
|
#define LIBAVFILTER_VERSION AV_VERSION(LIBAVFILTER_VERSION_MAJOR, \
|
|
LIBAVFILTER_VERSION_MINOR, \
|
|
LIBAVFILTER_VERSION_MICRO)
|
|
#define LIBAVFILTER_BUILD LIBAVFILTER_VERSION_INT
|
|
|
|
/**
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef FF_API_OLD_ALL_FORMATS_API
|
|
#define FF_API_OLD_ALL_FORMATS_API (LIBAVFILTER_VERSION_MAJOR < 3)
|
|
#endif
|
|
#ifndef FF_API_AVFILTERPAD_PUBLIC
|
|
#define FF_API_AVFILTERPAD_PUBLIC (LIBAVFILTER_VERSION_MAJOR < 4)
|
|
#endif
|
|
#ifndef FF_API_FOO_COUNT
|
|
#define FF_API_FOO_COUNT (LIBAVFILTER_VERSION_MAJOR < 4)
|
|
#endif
|
|
#ifndef FF_API_FILL_FRAME
|
|
#define FF_API_FILL_FRAME (LIBAVFILTER_VERSION_MAJOR < 4)
|
|
#endif
|
|
#ifndef FF_API_BUFFERSRC_BUFFER
|
|
#define FF_API_BUFFERSRC_BUFFER (LIBAVFILTER_VERSION_MAJOR < 4)
|
|
#endif
|
|
|
|
#endif /* AVFILTER_VERSION_H */
|