22d841becd
* master: (780 commits) ffmpeg: Fix doxygen comments for MetadataMap filters.texi: fix wrong references in the "Filtergraph syntax" section yadif: correct documentation on the parity parameter mpegvideo.h: remove the 1 line difference to qatar applehttp: fix variant discard logic Fix possible crash when decoding mpeg streams. h263dec: Fix asserts broken by the elimination of FF_COMMON_FRAME. avidec: skip seek pos adjustment for non interleaved files. Fixes Ticket327 lsws: remove deprecated and unused stuff after the 0->1 major bump cosmetics: remove some stray comments from AVCodec declarations cosmetics: fix indentation/alignment in AVCodec declarations Abort if command offset decreases, avoids potential endless loop. Warn when falling back to unreliable UMF fps tag. Detect NI-avi at playtime like mplayer. Fixes Ticket333 avidec: Fix XAN DPCM demuxing. Fix a possible miscompilation of cabac with old (broken) compilers. Fix -loop_input. Set bits_per_coded_sample when encoding ADPCM. vf_boxblur: call avfilter_draw_slice() at the end of draw_slice() vf_boxblur: fix out-of-buffer access when h > w ... Conflicts: ffmpeg.c libavcodec/avcodec.h libavcodec/opt.h libavcodec/version.h libavdevice/avdevice.h libavfilter/avfilter.h libavformat/avformat.h libavformat/aviobuf.c libavformat/rtsp.c libavformat/udp.c libavformat/utils.c libavformat/version.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
117 lines
4 KiB
C
117 lines
4 KiB
C
/*
|
|
*
|
|
* 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 AVCODEC_VERSION_H
|
|
#define AVCODEC_VERSION_H
|
|
|
|
#define LIBAVCODEC_VERSION_MAJOR 52
|
|
#define LIBAVCODEC_VERSION_MINOR 123
|
|
#define LIBAVCODEC_VERSION_MICRO 0
|
|
|
|
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
|
|
LIBAVCODEC_VERSION_MINOR, \
|
|
LIBAVCODEC_VERSION_MICRO)
|
|
#define LIBAVCODEC_VERSION AV_VERSION(LIBAVCODEC_VERSION_MAJOR, \
|
|
LIBAVCODEC_VERSION_MINOR, \
|
|
LIBAVCODEC_VERSION_MICRO)
|
|
#define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
|
|
|
|
#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
|
|
|
|
/**
|
|
* Those FF_API_* defines are not part of public API.
|
|
* They may change, break or disappear at any time.
|
|
*/
|
|
#ifndef FF_API_PALETTE_CONTROL
|
|
#define FF_API_PALETTE_CONTROL (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
#ifndef FF_API_MM_FLAGS
|
|
#define FF_API_MM_FLAGS (LIBAVCODEC_VERSION_MAJOR < 53)
|
|
#endif
|
|
#ifndef FF_API_OPT_SHOW
|
|
#define FF_API_OPT_SHOW (LIBAVCODEC_VERSION_MAJOR < 53)
|
|
#endif
|
|
#ifndef FF_API_AUDIO_OLD
|
|
#define FF_API_AUDIO_OLD (LIBAVCODEC_VERSION_MAJOR < 53)
|
|
#endif
|
|
#ifndef FF_API_VIDEO_OLD
|
|
#define FF_API_VIDEO_OLD (LIBAVCODEC_VERSION_MAJOR < 53)
|
|
#endif
|
|
#ifndef FF_API_SUBTITLE_OLD
|
|
#define FF_API_SUBTITLE_OLD (LIBAVCODEC_VERSION_MAJOR < 53)
|
|
#endif
|
|
#ifndef FF_API_USE_LPC
|
|
#define FF_API_USE_LPC (LIBAVCODEC_VERSION_MAJOR < 53)
|
|
#endif
|
|
#ifndef FF_API_SET_STRING_OLD
|
|
#define FF_API_SET_STRING_OLD (LIBAVCODEC_VERSION_MAJOR < 53)
|
|
#endif
|
|
#ifndef FF_API_INOFFICIAL
|
|
#define FF_API_INOFFICIAL (LIBAVCODEC_VERSION_MAJOR < 53)
|
|
#endif
|
|
#ifndef FF_API_OLD_SAMPLE_FMT
|
|
#define FF_API_OLD_SAMPLE_FMT (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
#ifndef FF_API_OLD_AUDIOCONVERT
|
|
#define FF_API_OLD_AUDIOCONVERT (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
#ifndef FF_API_HURRY_UP
|
|
#define FF_API_HURRY_UP (LIBAVCODEC_VERSION_MAJOR < 53)
|
|
#endif
|
|
#ifndef FF_API_RATE_EMU
|
|
#define FF_API_RATE_EMU (LIBAVCODEC_VERSION_MAJOR < 53)
|
|
#endif
|
|
#ifndef FF_API_MB_Q
|
|
#define FF_API_MB_Q (LIBAVCODEC_VERSION_MAJOR < 53)
|
|
#endif
|
|
#ifndef FF_API_ANTIALIAS_ALGO
|
|
#define FF_API_ANTIALIAS_ALGO (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
#ifndef FF_API_REQUEST_CHANNELS
|
|
#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
#ifndef FF_API_OPT_H
|
|
#define FF_API_OPT_H (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
#ifndef FF_API_THREAD_INIT
|
|
#define FF_API_THREAD_INIT (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
#ifndef FF_API_OLD_FF_PICT_TYPES
|
|
#define FF_API_OLD_FF_PICT_TYPES (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
#ifndef FF_API_FLAC_GLOBAL_OPTS
|
|
#define FF_API_FLAC_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
#ifndef FF_API_GET_PIX_FMT_NAME
|
|
#define FF_API_GET_PIX_FMT_NAME (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
#ifndef FF_API_ALLOC_CONTEXT
|
|
#define FF_API_ALLOC_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
#ifndef FF_API_AVCODEC_OPEN
|
|
#define FF_API_AVCODEC_OPEN (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
#ifndef FF_API_DRC_SCALE
|
|
#define FF_API_DRC_SCALE (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
#ifndef FF_API_VERY_AGGRESSIVE
|
|
#define FF_API_VERY_AGGRESSIVE (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
|
|
#endif /* AVCODEC_VERSION_H */
|