mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
6faf0a21e1
* qatar/master: (53 commits) probe: Restore identification of files with very large id3 tags and no extension. probe: Remove id3 tag presence as a criteria to do file extension checking. mpegts: MP4 SL support mpegts: MP4 OD support mpegts: Add support for Sections in PMT mpegts: Replace the MP4 descriptor parser with a recursive parser. mpegts: Add support for multiple mp4 descriptors mpegts: Parse mpeg2 SL descriptors. isom: Add MPEG4SYSTEMS dummy object type indication. aacdec: allow output reconfiguration on channel changes nellymoserenc: take float input samples instead of int16 nellymoserdec: use dsp functions for overlap and windowing nellymoserdec: do not fail if there is extra data in the packet nellymoserdec: fail if output buffer is too small nellymoserdec: remove pointless buffer size check. lavf: add init_put_byte() to the list of visible symbols. seek-test: free options dictionary after use snow: do not draw_edge if emu_edge is set tools/pktdumper: update to recent avformat api seek-test: update to recent avformat api ... Conflicts: doc/APIchanges libavcodec/mpegaudiodec.c libavcodec/nellymoserdec.c libavcodec/snow.c libavcodec/version.h libavcodec/wmadec.c libavformat/avformat.h libavformat/mpegts.c libavformat/mxfdec.c libavformat/utils.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
109 lines
3.8 KiB
C
109 lines
3.8 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 53
|
|
#define LIBAVCODEC_VERSION_MINOR 24
|
|
#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_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_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_ER
|
|
#define FF_API_ER (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
#ifndef FF_API_AVCODEC_INIT
|
|
#define FF_API_AVCODEC_INIT (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
#ifndef FF_API_X264_GLOBAL_OPTS
|
|
#define FF_API_X264_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
#ifndef FF_API_MPEGVIDEO_GLOBAL_OPTS
|
|
#define FF_API_MPEGVIDEO_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
#ifndef FF_API_LAME_GLOBAL_OPTS
|
|
#define FF_API_LAME_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
#ifndef FF_API_SNOW_GLOBAL_OPTS
|
|
#define FF_API_SNOW_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
#ifndef FF_API_MJPEG_GLOBAL_OPTS
|
|
#define FF_API_MJPEG_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
#ifndef FF_API_GET_ALPHA_INFO
|
|
#define FF_API_GET_ALPHA_INFO (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
#ifndef FF_API_PARSE_FRAME
|
|
#define FF_API_PARSE_FRAME (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
|
|
#endif /* AVCODEC_VERSION_H */
|