mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-02-21 06:16:59 +00:00
a12dec4699
* release/0.8: (31 commits) svq1dec: call avcodec_set_dimensions() after dimensions changed. Fixes NGS00148 vp3dec: Check coefficient index in vp3_dequant() Fixes NGS00145 qdm2dec: fix buffer overflow. Fixes NGS00144 h264: Fix invalid interlaced progressive MB combinations for direct mode prediction. Fixes Ticket312 mpegvideo: dont use ff_mspel_motion() for vc1 Fixes Ticket655 imgutils: Fix illegal read. ac3probe: Detect Sonic Foundry Soft Encode AC3 as raw AC3. Our ac3 code chain can handle it fine. More ideal would be to write a demuxer that actually extracts what can be from the additional headers and uses it for whatever it can be used for. mjpeg: support mpo Fixes stereoscopic_photo.mpo Add a version bump and APIchanges entry for avcodec_open2 and avformat_find_stream_info. lavf: fix multiplication overflow in avformat_find_stream_info() lavf: fix invalid reads in avformat_find_stream_info() lavf: add avformat_find_stream_info() lavc: fix parentheses placement in avcodec_open2(). lavc: introduce avcodec_open2() as a replacement for avcodec_open(). rawdec: use a default sample rate if none is specified. Fixes "ffmpeg -f s16le -i /dev/zero" rawdec: add check on sample_rate qdm2dec: check remaining input bits in the mainloop of qdm2_fft_decode_tones() This is neccessary but likely not sufficient to prevent out of array reads. cinepak: check strip_size wma: Check channel number before init. Fixes Ticket240 Do not try to read 16bit gray png files with alpha channel. ... Conflicts: libavcodec/version.h libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
109 lines
3.7 KiB
C
109 lines
3.7 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_AVCODEC_OPEN
|
|
#define FF_API_AVCODEC_OPEN (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
#endif
|
|
|
|
#endif /* AVCODEC_VERSION_H */
|