mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-17 21:14:47 +00:00
568e9062bd
* qatar/release/0.8: (154 commits) Update Changelog for the 0.8.1 Release dca: include libavutil/mathematics.h for possibly missing M_SQRT1_2 dca: don't use av_clip_uintp2(). snow: check reference frame indices. snow: reject unsupported chroma shifts. xa_adpcm: limit filter to prevent xa_adpcm_table[] array bounds overruns. h264: increase reference poc list from 16 to 32. h264: stricter reference limit enforcement. h264: improve parsing of broken AVC SPS Replace computations of remaining bits with calls to get_bits_left(). png: convert to bytestream2 API. roqvideo: convert to bytestream2 API. smc: port to bytestream2 API. tgq: convert to bytestream2 API. algmm: convert to bytestream2 API. jvdec: unbreak video decoding h264: Fix invalid interlaced/progressive MB combinations for direct mode prediction. libx264: add 'stats' private option for setting 2pass stats filename. libx264: fix help text for slice-max-size option. avconv: reindent ... Conflicts: Changelog RELEASE avconv.c doc/APIchanges ffplay.c libavcodec/Makefile libavcodec/aacdec.c libavcodec/alsdec.c libavcodec/atrac3.c libavcodec/avcodec.h libavcodec/dvdata.c libavcodec/fraps.c libavcodec/golomb.h libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_direct.c libavcodec/h264_parser.c libavcodec/h264_ps.c libavcodec/h264idct_template.c libavcodec/indeo3.c libavcodec/kgv1dec.c libavcodec/kmvc.c libavcodec/mjpegbdec.c libavcodec/mmvideo.c libavcodec/mpegaudiodec.c libavcodec/mpegvideo.h libavcodec/options.c libavcodec/pngdec.c libavcodec/roqvideodec.c libavcodec/shorten.c libavcodec/svq3.c libavcodec/utils.c libavcodec/version.h libavcodec/wmadec.c libavcodec/xxan.c libavformat/Makefile libavformat/asfdec.c libavformat/dv.c libavformat/mov.c libavformat/nsvdec.c libavformat/utils.c libavformat/version.h libavutil/avutil.h libavutil/error.c libavutil/error.h libswscale/swscale.c libswscale/utils.c libswscale/x86/swscale_template.c tests/ref/acodec/g722 Merged-by: Michael Niedermayer <michaelni@gmx.at>
131 lines
4.5 KiB
C
131 lines
4.5 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 61
|
|
#define LIBAVCODEC_VERSION_MICRO 100
|
|
|
|
#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 < 55)
|
|
#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
|
|
#ifndef FF_API_INTERNAL_CONTEXT
|
|
#define FF_API_INTERNAL_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
#ifndef FF_API_TIFFENC_COMPLEVEL
|
|
#define FF_API_TIFFENC_COMPLEVEL (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
#ifndef FF_API_DATA_POINTERS
|
|
#define FF_API_DATA_POINTERS (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
#ifndef FF_API_OLD_DECODE_AUDIO
|
|
#define FF_API_OLD_DECODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 55)
|
|
#endif
|
|
#ifndef FF_API_OLD_TIMECODE
|
|
#define FF_API_OLD_TIMECODE (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
|
|
#ifndef FF_API_AVFRAME_AGE
|
|
#define FF_API_AVFRAME_AGE (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
#ifndef FF_API_OLD_ENCODE_AUDIO
|
|
#define FF_API_OLD_ENCODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 55)
|
|
#endif
|
|
|
|
#endif /* AVCODEC_VERSION_H */
|