summaryrefslogtreecommitdiff
path: root/libavformat/avformat.h
Commit message (Collapse)AuthorAge
* lavf: add AV_DISPOSITION flags for WebVTT text track kindsMatthew Heaney2013-06-25
| | | | | | | | | | | There are 4 separate WebVTT text track kinds: subtitles (the default if not otherwise specified), captions, descriptions, and metadata. The WebM muxer needs to know which WebVTT text track kind this is, in order to synthesize the correct track type and codec id. To allow a demuxer to indicate the text track kind of the input, a new set of AV_DISPOSITION flag values has been added, corresponding to each of the non-default text track kind values.
* Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'Michael Niedermayer2013-05-05
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e0f8be6413b6a8d334d6052e610af32935c310af': avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate Conflicts: libavformat/ac3dec.c libavformat/avformat.h libavformat/avs.c libavformat/m4vdec.c libavformat/mov.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegvideodec.c libavformat/psxstr.c libavformat/pva.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriateDiego Biurrun2013-05-04
| |
* | lavf: filter out AVSEEK_FLAG_BACKWARD in new API.Nicolas George2013-05-04
| | | | | | | | Also document that it has no effect.
* | Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'Michael Niedermayer2013-05-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7': silly typo fixes Conflicts: doc/protocols.texi libavcodec/aacpsy.c libavformat/utils.c tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * silly typo fixesDiego Biurrun2013-05-03
| |
* | avformat/mux: set avoid_negative_ts based on flags if not overridden by user ↵Michael Niedermayer2013-04-26
| | | | | | | | | | | | | | | | or muxer This changes the default to avoid negative timestamps. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c2cb01d418dd18e1cf997c038d37378d773121be'Michael Niedermayer2013-04-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c2cb01d418dd18e1cf997c038d37378d773121be': lavf: introduce AVFMT_TS_NEGATIVE Conflicts: libavformat/avformat.h libavformat/mux.c tests/ref/lavf/asf tests/ref/lavf/mkv tests/ref/lavf/mpg tests/ref/lavf/ts tests/ref/seek/lavf-asf tests/ref/seek/lavf-mkv tests/ref/seek/lavf-mpg tests/ref/seek/lavf-ts This commit does not change the default ts behaviour, such change will, if its done, be done separately. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: introduce AVFMT_TS_NEGATIVELuca Barbato2013-04-25
| | | | | | | | | | | | | | | | | | | | Most formats do not support negative timestamps, shift them to avoid unexpected behaviour and a number of bad crashes. CC:libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * lavf: remove disabled FF_API_R_FRAME_RATE cruftAnton Khirnov2013-03-11
| |
* | avformat: Add a mechanism to allow demuxers to detect byte based seeking.Michael Niedermayer2013-04-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg/avformat: factor av_guess_frame_rate() outMichael Niedermayer2013-03-29
| | | | | | | | | | | | This will be used in ffplay Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mux: add the flush_packets option.Nicolas George2013-03-24
| | | | | | | | Note: a lot of muxers already do the flushing explicitly.
* | lavf/avformat.h: fix a few typos in AVFormatContext:avoid_negative_ts doxyStefano Sabatini2013-03-19
| |
* | Merge commit '7b486ab13bfcfa88a7cd92586de50e49966ec292'Michael Niedermayer2013-03-13
|\| | | | | | | | | | | | | | | | | | | | | * commit '7b486ab13bfcfa88a7cd92586de50e49966ec292': lavf: remove disabled FF_API_AV_GETTIME cruft lavf: remove disabled FF_API_INTERLEAVE_PACKET cruft Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: remove disabled FF_API_AV_GETTIME cruftAnton Khirnov2013-03-11
| |
| * lavf: remove disabled FF_API_INTERLEAVE_PACKET cruftAnton Khirnov2013-03-11
| |
| * lavf: remove disabled FF_API_READ_PACKET cruftAnton Khirnov2013-03-11
| |
| * lavf: remove disabled FF_API_CLOSE_INPUT_FILE cruftAnton Khirnov2013-03-11
| |
* | avformat: keep r_frame_rateMichael Niedermayer2013-03-12
| | | | | | | | | | | | This field is used and nothing equivalent exists Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'Michael Niedermayer2013-03-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1afddbe59e96af75f1c07605afc95615569f388f': avpacket: use AVBuffer to allow refcounting the packets. Conflicts: libavcodec/avpacket.c libavcodec/utils.c libavdevice/v4l2.c libavformat/avidec.c libavformat/flacdec.c libavformat/id3v2.c libavformat/matroskaenc.c libavformat/mux.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avpacket: use AVBuffer to allow refcounting the packets.Anton Khirnov2013-03-08
| | | | | | | | | | | | This will allow us to avoid copying the packets in many cases. This breaks ABI.
| * miscellaneous typo fixesDiego Biurrun2012-12-21
| |
* | avformat: Make duration estimation from pts more robustMichael Niedermayer2013-03-04
| | | | | | | | | | | | | | Ignore durations which differ significantly from the previous Fixes Ticket2018 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: Allocate duration_error separatelyMichael Niedermayer2013-02-23
| | | | | | | | | | | | | | This significantly reduces the memory needed per AVStream when the array is not needed. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix a few "its" vs "it's" typo.Clément Bœsch2013-02-14
| |
* | lavf: add seek2any to allow forcing seeking to non keyframes via AVOptionsMichael Niedermayer2013-02-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add a new function av_codec_get_tag2().Carl Eugen Hoyos2013-01-17
| | | | | | | | | | | | av_codec_get_tag() may return 0 both in case a codec_tag was found and if no codec_tag was found. The new function does not have this ambiguity.
* | lavf: Provide a monotonic timestamp to the outside worldHarald Axmann2012-12-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | av_register_protocol is gone :(Paul B Mahol2012-12-04
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | use correct doxygen parameter direction syntaxPeter Ross2012-11-21
| | | | | | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org> Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add -skip_initial_bytes option.Carl Eugen Hoyos2012-11-20
| | | | | | | | Fixes ticket #1909.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-11-15
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: bgmc: Fix av_malloc checks in ff_bgmc_init() rtp: set the payload type as stream id Conflicts: libavformat/rtpenc_chain.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtp: set the payload type as stream idLuca Barbato2012-11-14
| | | | | | | | | | | | | | Support multiple video/audio streams with different format in the same session. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '3b4296f41473a5b39e84d7a49d480624c9c60040'Michael Niedermayer2012-11-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3b4296f41473a5b39e84d7a49d480624c9c60040': avformat: clarify stream id for muxing fate: Add dependencies for aac, alac, amrnb, amrwb, atrac tests ppc: do not pass redundant compiler flags avutil: change GET_UTF8 to not use av_log2() segment: fix NULL pointer dereference in seg_write_header() Conflicts: tests/fate/aac.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: clarify stream id for muxingLuca Barbato2012-11-14
| |
* | Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f'Michael Niedermayer2012-11-03
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '9221efef7968463f3e3d9ce79ea72eaca082e73f': lavf: fix av_interleaved_write_frame() doxy. lavf: clarify the lifetime of demuxed packets. avconv: do not free muxed packet on streamcopy. crc: move doxy to the header vf_drawtext: do not use deprecated av_tree_node_size x86: Refactor PSWAPD fallback implementations and port to cpuflags Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: fix av_interleaved_write_frame() doxy.Anton Khirnov2012-11-02
| | | | | | | | A sentence was mistakenly inserted in the middle of another sentence.
| * lavf: clarify the lifetime of demuxed packets.Anton Khirnov2012-11-02
| |
* | lavf: const correctness for avformat_new_streamPaul B Mahol2012-10-24
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavf: fix duration estimation for multi program TSMichael Niedermayer2012-10-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95'Michael Niedermayer2012-10-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95': avformat: Fix references to the removed function av_write_header in comments changelog: Mention the MSVC DLL support fate: add dependencies for misc microsoft codecs fate-twinvq: add dependencies fate-mpc: add dependencies fate-indeo: add dependencies fate-als: add dependencies fate: dependencies for demux tests Conflicts: Changelog tests/Makefile tests/fate/demux.mak tests/fate/microsoft.mak tests/fate/mpc.mak tests/fate/vqf.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Fix references to the removed function av_write_header in commentsMartin Storsjö2012-10-18
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf: fix fps detection with PAFF H.264Michael Niedermayer2012-10-14
| | | | | | | | | | Fixes Ticket1065 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: add a AVPROBE_SCORE_RETRY instead of using hardcoded values.Michael Niedermayer2012-10-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: fix typo in commentPaul B Mahol2012-10-07
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d'Michael Niedermayer2012-10-02
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d': avconv: improve sample format negotiation for decoder request Opus encoder using libopus mpegts: Drop pointless casting of hex_dump_debug arguments avformat: const correctness for av_hex_dump / av_hex_dump_log wmadec: Adjust debug printf argument length modifier Conflicts: Changelog ffmpeg.c libavcodec/libopusdec.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: const correctness for av_hex_dump / av_hex_dump_logDiego Biurrun2012-10-01
| |
* | lavf: move fields that appear to be intended as public API to the correct ↵Michael Niedermayer2012-09-27
| | | | | | | | | | | | section Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: Add support offset timestamps on muxing.Michael Niedermayer2012-09-26
| | | | | | | | | | | | This allows avoiding negative timestamps. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>