RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
ffmpeg/libavformat/version.h

83 lines
2.9 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 19:18:06 +00: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
lavf doxy: add installed headers to groups.
2011-12-10 19:16:57 +00:00
/**
* @file
* @ingroup libavf
* Libavformat version macros
*/
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 19:18:06 +00:00
#include "libavutil/avutil.h"
Add the bumps and APIchanges entries for reference counted buffers changes.
2013-02-17 09:31:25 +00:00
#define LIBAVFORMAT_VERSION_MAJOR 55
Merge commit '2d2d6a4883479403798f4ed46941d5b365823570' * commit '2d2d6a4883479403798f4ed46941d5b365823570': lavf: add a raw WavPack muxer. apetag: add support for writing APE tags matroskaenc: support muxing WavPack Conflicts: libavformat/Makefile libavformat/allformats.c libavformat/apetag.h libavformat/version.h libavformat/wvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-29 08:19:20 +00:00
#define LIBAVFORMAT_VERSION_MINOR 8
lavf/id3v2enc: fix cover art display on some software Adding an arbitrary amount of padding bytes at the end of the ID3 metadata fixes cover art display for some software (iTunes, Traktor, Serato, Torq). For reference (ID3 metadata): [ Apic frames ] -> cover doesn't show up [ Apic frames, Padding ] -> ok [ Apic frames, ID3 frames ] -> ok [ ID3 frames, Apic frames ] -> cover doesn't show up [ ID3 frames, Apic frames, Padding ] -> ok
2013-05-29 10:05:26 +00:00
#define LIBAVFORMAT_VERSION_MICRO 102
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 19:18:06 +00: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)
/**
Clarify Doxygen comment for FF_API_* #defines.
2012-07-03 20:42:42 +00:00
* FF_API_* defines may be placed below to indicate public API that will be
* dropped at a future version bump. The defines themselves are not part of
* the public API and may change, break or disappear at any time.
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 19:18:06 +00:00
*/
Clarify Doxygen comment for FF_API_* #defines.
2012-07-03 20:42:42 +00:00
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 19:18:07 +00:00
#ifndef FF_API_OLD_AVIO
Merge remote-tracking branch 'qatar/master' * qatar/master: (71 commits) movenc: Allow writing to a non-seekable output if using empty moov movenc: Support adding isml (smooth streaming live) metadata libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set sunrast: Document the different Sun Raster file format types. sunrast: Add a check for experimental type. libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat lavf: remove disabled FF_API_SET_PTS_INFO cruft lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft lavf: remove disabled FF_API_REORDER_PRIVATE cruft lavf: remove disabled FF_API_SEEK_PUBLIC cruft lavf: remove disabled FF_API_STREAM_COPY cruft lavf: remove disabled FF_API_PRELOAD cruft lavf: remove disabled FF_API_NEW_STREAM cruft lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft lavf: remove disabled FF_API_MUXRATE cruft lavf: remove disabled FF_API_FILESIZE cruft lavf: remove disabled FF_API_TIMESTAMP cruft lavf: remove disabled FF_API_LOOP_OUTPUT cruft lavf: remove disabled FF_API_LOOP_INPUT cruft lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft ... Conflicts: doc/APIchanges libavcodec/8bps.c libavcodec/avcodec.h libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/options.c libavcodec/sunrast.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/h264_deblock.asm libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/avformat.h libavformat/avio.c libavformat/avio.h libavformat/aviobuf.c libavformat/dv.c libavformat/mov.c libavformat/utils.c libavformat/version.h libavformat/wtv.c libavutil/Makefile libavutil/file.c libswscale/x86/input.asm libswscale/x86/swscale_mmx.c libswscale/x86/swscale_template.c tests/ref/lavf/ffm Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-28 03:23:26 +00:00
#define FF_API_OLD_AVIO (LIBAVFORMAT_VERSION_MAJOR < 55)
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 08:52:38 +00:00
#endif
lavf: mark av_pkt_dump(_log) for remove on $next+1 bump.
2011-04-05 10:59:27 +00:00
#ifndef FF_API_PKT_DUMP
#define FF_API_PKT_DUMP (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 20:09:34 +00:00
#ifndef FF_API_ALLOC_OUTPUT_CONTEXT
avformat: postpone API removials where the functions are trivial wrapers Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 11:43:02 +00:00
#define FF_API_ALLOC_OUTPUT_CONTEXT (LIBAVFORMAT_VERSION_MAJOR < 56)
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 20:09:34 +00:00
#endif
mpegts: add compute_pcr option. Deprecate the corresponding AVFormatParameters field.
2011-04-30 11:42:55 +00:00
#ifndef FF_API_FORMAT_PARAMETERS
avformat: postpone API removials where the functions are trivial wrapers Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 11:43:02 +00:00
#define FF_API_FORMAT_PARAMETERS (LIBAVFORMAT_VERSION_MAJOR < 56)
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-23 22:49:09 +00:00
#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 09:19:27 +00:00
#ifndef FF_API_NEW_STREAM
avformat: postpone API removials where the functions are trivial wrapers Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 11:43:02 +00:00
#define FF_API_NEW_STREAM (LIBAVFORMAT_VERSION_MAJOR < 56)
avio: Mark the old interrupt callback mechanism as deprecated Prepare for removing it at an upcoming major bump.
2011-11-07 10:17:50 +00:00
#endif
lavf: make av_set_pts_info private. It's supposed to be called only from (de)muxers.
2011-11-29 18:28:15 +00:00
#ifndef FF_API_SET_PTS_INFO
avformat: postpone API removials where the functions are trivial wrapers Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 11:43:02 +00:00
#define FF_API_SET_PTS_INFO (LIBAVFORMAT_VERSION_MAJOR < 56)
lavf: make av_set_pts_info private. It's supposed to be called only from (de)muxers.
2011-11-29 18:28:15 +00:00
#endif
lavf: add avformat_close_input(). It sets the supplied AVFormatContext pointer to NULL after freeing it, which is safer and its name is consistent with other lavf functions. Also deprecate av_close_input_file().
2011-12-11 09:34:08 +00:00
#ifndef FF_API_CLOSE_INPUT_FILE
Merge commit '0a7c4daf469d4ac447fb822fe78337f62f4c04e6' * commit '0a7c4daf469d4ac447fb822fe78337f62f4c04e6': lavf: remove disabled FF_API_CLOSE_INPUT_FILE cruft Conflicts: libavformat/version.h removial postponed as the wraper code is trivial Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 11:12:06 +00:00
#define FF_API_CLOSE_INPUT_FILE (LIBAVFORMAT_VERSION_MAJOR < 56)
lavf: add avformat_close_input(). It sets the supplied AVFormatContext pointer to NULL after freeing it, which is safer and its name is consistent with other lavf functions. Also deprecate av_close_input_file().
2011-12-11 09:34:08 +00:00
#endif
lavf: deprecate av_read_packet(). The caller can achieve the same effect (i.e. getting raw unparsed/mangled packets) with av_read_frame() and AVFMT_FLAG_NOPARSE | AVFMT_FLAG_NOFILLIN
2012-03-04 20:41:59 +00:00
#ifndef FF_API_READ_PACKET
Merge commit '435c2a31ad5eead20eda1152097f60c3bfa22847' * commit '435c2a31ad5eead20eda1152097f60c3bfa22847': lavf: remove disabled FF_API_READ_PACKET cruft Conflicts: libavformat/version.h Removial postponed as wraper is trivial Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 11:29:26 +00:00
#define FF_API_READ_PACKET (LIBAVFORMAT_VERSION_MAJOR < 56)
lavf: deprecate av_read_packet(). The caller can achieve the same effect (i.e. getting raw unparsed/mangled packets) with av_read_frame() and AVFMT_FLAG_NOPARSE | AVFMT_FLAG_NOFILLIN
2012-03-04 20:41:59 +00:00
#endif
subtitles: introduce ASS codec id and use it. Currently, we have a AV_CODEC_ID_SSA, which matches the way the ASS/SSA markup is muxed in a standalone .ass/.ssa file. This means the AVPacket data starts with a "Dialogue:" string, followed by a timing information (start and end of the event as string) and a trailing CRLF after each line. One packet can contain several lines. We'll refer to this layout as "SSA" or "SSA lines". In matroska, this markup is not stored as such: it has no "Dialogue:" prefix, it contains a ReadOrder field, the timing information is not in the payload, and it doesn't contain the trailing CRLF. See [1] for more info. We'll refer to this layout as "ASS". Since we have only one common codec for both formats, the matroska demuxer is constructing an AVPacket following the "SSA lines" format. This causes several problems, so it was decided to change this into clean ASS packets. Some insight about what is changed or unchanged in this commit: CODECS ------ - the decoding process still writes "SSA lines" markup inside the ass fields of the subtitles rectangles (sub->rects[n]->ass), which is still the current common way of representing decoded subtitles markup. It is meant to change later. - new ASS codec id: AV_CODEC_ID_ASS (which is different from the legacy AV_CODEC_ID_SSA) - lavc/assdec: the "ass" decoder is renamed into "ssa" (instead of "ass") for consistency with the codec id and allows to add a real ass decoder. This ass decoder receives clean ASS lines (so it starts with a ReadOrder, is followed by the Layer, etc). We make sure this is decoded properly in a new ass-line rectangle of the decoded subtitles (the ssa decoder OTOH is doing a simple straightforward copy). Using the packet timing instead of data string makes sure the ass-line now contains the appropriate timing. - lavc/assenc: just like the ass decoder, the "ssa" encoder is renamed into "ssa" (instead of "ass") for consistency with the codec id, and allows to add a real "ass" encoder. One important thing about this encoder is that it only supports one ass rectangle: we could have put several dialogue events in the AVPacket (separated by a \0 for instance) but this would have cause trouble for the muxer which needs not only the start time, but also the duration: typically, you have merged events with the same start time (stored in the AVPacket->pts) but a different duration. At the moment, only the matroska do the merge with the SSA-line codec. We will need to make sure all the decoders in the future can't add more than one rectangle (and only one Dialogue line in it obviously). FORMATS ------- - lavf/assenc: the .ass/.ssa muxer can take both SSA and ASS packets. In the case of ASS packets as input, it adds the timing based on the AVPacket pts and duration, and mux it with "Dialogue:", trailing CRLF, etc. - lavf/assdec: unchanged; it currently still only outputs SSA-lines packets. - lavf/mkv: the demuxer can now output ASS packets without the need of any "SSA-lines" reconstruction hack. It will become the default at next libavformat bump, and the SSA support will be dropped from the demuxer. The muxer can take ASS packets since it's muxed normally, and still supports the old SSA packets. All the SSA support and hacks in Matroska code will be dropped at next lavf bump. [1]: http://www.matroska.org/technical/specs/subtitles/ssa.html
2013-01-03 02:06:43 +00:00
#ifndef FF_API_ASS_SSA
#define FF_API_ASS_SSA (LIBAVFORMAT_VERSION_MAJOR < 56)
#endif
lavf: deprecate r_frame_rate. According to its description, it is supposed to be the LCM of all the frame durations. The usability of such a thing is vanishingly small, especially since we cannot determine it with any amount of reliability. Therefore get rid of it after the next bump. Replace it with the average framerate where it makes sense. FATE results for the wtv and xmv demux tests change. In the wtv case this is caused by the file being corrupted (or possibly badly cut) and containing invalid timestamps. This results in lavf estimating the framerate wrong and making up wrong frame durations. In the xmv case the file contains pts jumps, so again the estimated framerate is far from anything sane and lavf again makes up different frame durations. In some other tests lavf starts making up frame durations from different frame.
2012-06-26 11:10:01 +00:00
#ifndef FF_API_R_FRAME_RATE
Merge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111' * commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111': Add the bumps and APIchanges entries for reference counted buffers changes. Conflicts: Changelog doc/APIchanges libavcodec/version.h libavdevice/version.h libavfilter/version.h libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 14:29:20 +00:00
#define FF_API_R_FRAME_RATE 1
lavf: deprecate r_frame_rate. According to its description, it is supposed to be the LCM of all the frame durations. The usability of such a thing is vanishingly small, especially since we cannot determine it with any amount of reliability. Therefore get rid of it after the next bump. Replace it with the average framerate where it makes sense. FATE results for the wtv and xmv demux tests change. In the wtv case this is caused by the file being corrupted (or possibly badly cut) and containing invalid timestamps. This results in lavf estimating the framerate wrong and making up wrong frame durations. In the xmv case the file contains pts jumps, so again the estimated framerate is far from anything sane and lavf again makes up different frame durations. In some other tests lavf starts making up frame durations from different frame.
2012-06-26 11:10:01 +00:00
#endif
multiple inclusion guard cleanup Add missing multiple inclusion guards; clean up #endif comments; add missing library prefixes; keep guard names consistent.
2011-05-17 14:58:04 +00:00
#endif /* AVFORMAT_VERSION_H */