virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
957a593cd9
FFmpeg/libavformat/version.h

121 lines
4.3 KiB
C
Raw Normal View History

lavf: move the version macros to a new header Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 50196a982bf7c8be9b41053fa0975473c217e709)
2011-01-21 21:18:06 +02:00
/*
* 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 AVFORMAT_VERSION_H
#define AVFORMAT_VERSION_H
#include "libavutil/avutil.h"
Bump major versions of all libraries. They've accumulated enough new APIs and corresponding deprecated cruft. This breaks API and ABI.
2011-02-03 13:18:16 +02:00
#define LIBAVFORMAT_VERSION_MAJOR 53
Merge remote-tracking branch 'qatar/master' * qatar/master: (42 commits) swscale: fix signed overflow in yuv2mono_X_c_template snow: fix integer overflows svq1enc: remove stale altivec-related hack snow: fix signed overflow in byte to 32-bit replication adx: rename ff_adx_decode_header() to avpriv_adx_decode_header() avformat: add CRI ADX format demuxer adx: add an ADX parser. adx: move header decoding to ADX common code adx: calculate the number of blocks in a packet adx: define and use 2 new macro constants BLOCK_SIZE and BLOCK_SAMPLES adx: check for unsupported ADX formats adx: simplify encoding by using put_sbits() adx: calculate correct LPC coeffs adx: use 12-bit coefficients instead of 14-bit to avoid integer overflow adx: simplify adx_decode() by using get_sbits() to read residual samples adx: fix the data offset parsing in adx_decode_header() adx: remove unneeded post-decode channel interleaving adx: validate header values adx: cosmetics: general pretty-printing and comment clean-up adx: remove useless comments ... Conflicts: Changelog libavcodec/cook.c libavcodec/fraps.c libavcodec/nuv.c libavcodec/pthread.c libavcodec/version.h libavformat/Makefile libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-27 02:30:13 +03:00
#define LIBAVFORMAT_VERSION_MINOR 22
lavf: add avformat_new_stream as a replacement for av_new_stream. It takes a codec parameter, thus enabling codec-specific defaults.
2011-06-18 12:19:27 +03:00
#define LIBAVFORMAT_VERSION_MICRO 0
lavf: move the version macros to a new header Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 50196a982bf7c8be9b41053fa0975473c217e709)
2011-01-21 21:18:06 +02:00
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
LIBAVFORMAT_VERSION_MICRO)
#define LIBAVFORMAT_VERSION AV_VERSION(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
LIBAVFORMAT_VERSION_MICRO)
#define LIBAVFORMAT_BUILD LIBAVFORMAT_VERSION_INT
#define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
/**
* Those FF_API_* defines are not part of public API.
* They may change, break or disappear at any time.
*/
lavf: postpone removal of public metadata conversion API Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-23 09:01:35 +02:00
#ifndef FF_API_OLD_METADATA2
#define FF_API_OLD_METADATA2 (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
lavf: move the version macros to a new header Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 50196a982bf7c8be9b41053fa0975473c217e709)
2011-01-21 21:18:06 +02:00
#ifndef FF_API_READ_SEEK
#define FF_API_READ_SEEK (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
avio: add av_put_str and deprecate put_strz in favor of it Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 4efd5cf34b7a04f87805aa0f09913d1d122d300c)
2011-01-21 21:18:07 +02:00
#ifndef FF_API_OLD_AVIO
lavf: postpone removal of deprecated avio functions Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-23 09:01:36 +02:00
#define FF_API_OLD_AVIO (LIBAVFORMAT_VERSION_MAJOR < 54)
avio: add av_put_str and deprecate put_strz in favor of it Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 4efd5cf34b7a04f87805aa0f09913d1d122d300c)
2011-01-21 21:18:07 +02:00
#endif
lavf: add av_ prefix to dump_format() Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 610219a598095f938705f200dfe3946455ef871a)
2011-02-16 10:52:35 +02:00
#ifndef FF_API_DUMP_FORMAT
#define FF_API_DUMP_FORMAT (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
Deprecate parse_date() in favor of av_parse_time(). The new av_parse_time() is created in libavutil/parseutils.h, all the internal functions used by parse_date are moved to libavutil/parseutils.c and made static. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit f6c7375a175ac649558aefab14f3895b2cb469aa)
2011-02-16 10:52:36 +02:00
#ifndef FF_API_PARSE_DATE
#define FF_API_PARSE_DATE (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
Move find_info_tag to lavu and add av_ prefix to it Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net> (cherry picked from commit ab0287fcbdebc8ff416214535d7ee8424406990e)
2011-02-16 10:52:38 +02:00
#ifndef FF_API_FIND_INFO_TAG
#define FF_API_FIND_INFO_TAG (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
lavf: mark av_pkt_dump(_log) for remove on $next+1 bump.
2011-04-05 13:59:27 +03:00
#ifndef FF_API_PKT_DUMP
#define FF_API_PKT_DUMP (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
lavf: make av_guess_image2_codec internal It doesn't look very useful as a public function.
2011-04-05 14:13:53 +03:00
#ifndef FF_API_GUESS_IMG2_CODEC
#define FF_API_GUESS_IMG2_CODEC (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
lavf: rename avf_sdp_create to av_sdp_create. The new name is more consistent with the rest of the API.
2011-04-08 12:36:12 +03:00
#ifndef FF_API_SDP_CREATE
#define FF_API_SDP_CREATE (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
lavf: deprecate avformat_alloc_output_context() in favor of avformat_alloc_output_context2() The new function accepts a slightly more intuitive order of paramters, and returns an error code, thus allowing applications to report a meaningful error message.
2011-05-19 23:09:34 +03:00
#ifndef FF_API_ALLOC_OUTPUT_CONTEXT
#define FF_API_ALLOC_OUTPUT_CONTEXT (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
mpegts: add compute_pcr option. Deprecate the corresponding AVFormatParameters field.
2011-04-30 14:42:55 +03:00
#ifndef FF_API_FORMAT_PARAMETERS
#define FF_API_FORMAT_PARAMETERS (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
movenc: Deprecate the global RTP hinting flag, use a private AVOption instead Instead of -fflags rtphint, set -movflags rtphint instead. Signed-off-by: Martin Storsjö <martin@martin.st>
2011-05-20 12:27:02 +03:00
#ifndef FF_API_FLAG_RTP_HINT
#define FF_API_FLAG_RTP_HINT (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
lavf: deprecate AVStream.quality. AVStream is no place for it and it's unused outside of ffmpeg anyway.
2011-06-20 14:08:40 +03:00
#ifndef FF_API_AVSTREAM_QUALITY
#define FF_API_AVSTREAM_QUALITY (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
img2: add loop private option. Deprecate AVFormatContext.loop_input.
2011-06-18 10:28:49 +03:00
#ifndef FF_API_LOOP_INPUT
#define FF_API_LOOP_INPUT (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
gif: add loop private option. Deprecate AVFormatContext.loop_output.
2011-06-18 10:47:46 +03:00
#ifndef FF_API_LOOP_OUTPUT
#define FF_API_LOOP_OUTPUT (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
lavf: deprecate AVFormatContext.timestamp It's replaced by 'creation_time' metadata tag.
2011-07-07 12:25:03 +03:00
#ifndef FF_API_TIMESTAMP
#define FF_API_TIMESTAMP (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
lavf: deprecate AVFormatContext.file_size It's too unreliable to be useful. avio_size() should be called instead.
2011-10-09 15:12:14 +03:00
#ifndef FF_API_FILESIZE
#define FF_API_FILESIZE (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
mpegenc/mpegtsenc: add muxrate private options. Deprecate AVFormatContext.mux_rate.
2011-10-09 15:40:11 +03:00
#ifndef FF_API_MUXRATE
#define FF_API_MUXRATE (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
rtsp: Accept options via private avoptions instead of URL options Eventually, the old way of passing options by adding stuff to the URL can be dropped. This avoids having to tamper with the user-specified URL to pass options on the transport mode. This also works better with redirects, since the options don't need to be parsed out from the URL. Signed-off-by: Martin Storsjö <martin@martin.st>
2011-06-24 01:49:09 +03:00
#ifndef FF_API_RTSP_URL_OPTIONS
#define FF_API_RTSP_URL_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
lavf: add avformat_new_stream as a replacement for av_new_stream. It takes a codec parameter, thus enabling codec-specific defaults.
2011-06-18 12:19:27 +03:00
#ifndef FF_API_NEW_STREAM
#define FF_API_NEW_STREAM (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
mpegenc: add preload private option. Deprecate AVFormatContext.preload.
2011-10-09 16:04:38 +03:00
#ifndef FF_API_PRELOAD
#define FF_API_PRELOAD (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
lavf: deprecate AVStream.stream_copy It's only used in avconv, so it properly belongs to OutputStream struct there.
2011-10-23 12:22:33 +03:00
#ifndef FF_API_STREAM_COPY
#define FF_API_STREAM_COPY (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
lavf: make some seeking functions private Specifically av_update_cur_dts(), av_seek_frame_binary() and av_gen_search(). They are not supposed to be called outside lavf.
2011-10-16 16:03:30 +03:00
#ifndef FF_API_SEEK_PUBLIC
#define FF_API_SEEK_PUBLIC (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
lavf: move private fields in AVFormatContext to the end at next bump.
2011-10-19 21:00:09 +03:00
#ifndef FF_API_REORDER_PRIVATE
#define FF_API_REORDER_PRIVATE (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
avio: Mark the old interrupt callback mechanism as deprecated Prepare for removing it at an upcoming major bump.
2011-11-07 13:17:50 +03:00
#ifndef FF_API_OLD_INTERRUPT_CB
#define FF_API_OLD_INTERRUPT_CB (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
lavf: move the version macros to a new header Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 50196a982bf7c8be9b41053fa0975473c217e709)
2011-01-21 21:18:06 +02:00
multiple inclusion guard cleanup Add missing multiple inclusion guards; clean up #endif comments; add missing library prefixes; keep guard names consistent.
2011-05-17 17:58:04 +03:00
#endif /* AVFORMAT_VERSION_H */
Reference in New Issue Copy Permalink