summaryrefslogtreecommitdiff
path: root/libavformat/avformat.h
Commit message (Collapse)AuthorAge
* avformat: replace some odd 30-60 rates by higher less odd ones in ↵Michael Niedermayer2014-11-21
| | | | | | | | get_std_framerate() Fixes Ticket4012 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Read (display) aspect ratio from mxf files.Carl Eugen Hoyos2014-11-17
| | | | Fixes ticket #4107.
* lavf/ffm: store/restore private codec contextLukasz Marek2014-11-16
| | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* Merge commit '1384df641994bf3d6cb51084290aa94752737bae'Michael Niedermayer2014-11-07
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1384df641994bf3d6cb51084290aa94752737bae': lavf: Add an option for avoiding negative timestamps Conflicts: libavformat/avformat.h libavformat/mux.c libavformat/options_table.h libavformat/version.h See: 3ba0dab76ac32f0c9f50c916a73bc64e43c1fdf9 See: a89c01253190b9eb9de8e28a3252423bf7732511 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Add an option for avoiding negative timestampsMichael Niedermayer2014-11-07
| | | | | | | | | | | | | | | | | | | | | | This is the same logic as is invoked on AVFMT_TS_NEGATIVE, but which can be enabled manually, or can be enabled in muxers which only need it in certain conditions. Also allow using the same mechanism to force streams to start at 0. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat: Add format_whitelistMichael Niedermayer2014-10-19
| | | | | | | | | | | | | | | | This allows restricting demuxers to a list of needed ones for improved security Note, some demuxers themselfs open other demuxers, these are only restricted if AVOptions are forwarded to them. Please check that your code does that. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fix seperator typoMichael Niedermayer2014-10-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: Allow choosing the dump format field separator.Michael Niedermayer2014-10-09
| | | | | | | | | | | | The default is to maintain the previous ", " for now. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b15b06ebf582ae81e47d236524c9ad6e10c8a0a7'Michael Niedermayer2014-10-08
|\| | | | | | | | | | | | | | | | | | | * commit 'b15b06ebf582ae81e47d236524c9ad6e10c8a0a7': avformat: use const char* instead of uint8_t* for AVProbeData.mime_type Conflicts: libavformat/format.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: use const char* instead of uint8_t* for AVProbeData.mime_typeAndreas Cadhalpun2014-10-08
| | | | | | | | | | | | | | This makes the field consistent with AVInputFormat.mime_type and the argument type of av_match_name. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avformat: remove obsolete FF_API_READ_PACKET cruftJames Almer2014-10-05
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat: remove obsolete FF_API_CLOSE_INPUT_FILE cruftJames Almer2014-10-05
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat: remove obsolete FF_API_SET_PTS_INFO cruftJames Almer2014-10-05
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat: remove obsolete FF_API_NEW_STREAM cruftJames Almer2014-10-05
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat: remove obsolete FF_API_FORMAT_PARAMETERS cruftJames Almer2014-10-05
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat: remove obsolete FF_API_ALLOC_OUTPUT_CONTEXT cruftJames Almer2014-10-05
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat/mp3dec: avoid early EOF with concatenated gapless mp3swm42014-09-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consider a file created with something like: cat file1.mp3 file2.mp3 > result.mp3 Then if file2.mp3 has gapless information, result.mp3 would stop playing something in the middle. This happens because the gapless info directs the decoder to discard all samples after a certain position. To make matters worse, the gapless info of file2.mp3 will be used when playing the file1.mp3 part, because the gapless info is located at the end of the file. While handling concatenated gapless files correctly would be insane and a lot of effort (especially without scanning the whole file on opening), it's easy to prevent at least early EOF. Playback will happen to work, even if it's slightly broken. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mp3dec: fix gapless audio supportwm42014-09-20
| | | | | | | | | | | | | | | | | | | | | | | | The code already had skipping of initial padding, but discarding trailing frame padding was missing. This is somewhat questionable, because it will make the decoder discard any data after the declared file size in the LAME header. But note that skipping full frames at the end of the stream is required. Encoders actually create such files. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d'Michael Niedermayer2014-08-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d': lavf: add AVFormatContext.max_ts_probe Conflicts: doc/APIchanges libavformat/avformat.h libavformat/utils.c libavformat/version.h lavf-fate/mp3 changes as the estimated input bitrate changes and that is copied to the output Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: add AVFormatContext.max_ts_probeAnton Khirnov2014-08-25
| | | | | | | | | | It allows to configure how long will avformat_find_stream_info() wait to get the first timestamp.
* | Merge commit 'afbd4b7e093adf6d7a830b32759ca3ba8500363d'Michael Niedermayer2014-08-13
|\| | | | | | | | | | | | | | | | | | | | | * commit 'afbd4b7e093adf6d7a830b32759ca3ba8500363d': lavf: add AVFormatContext/AVStream fields for signaling to the user when events happen. Conflicts: libavformat/avformat.h libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: add AVFormatContext/AVStream fields for signaling to the user when ↵Andrew Stone2014-08-13
| | | | | | | | | | | | | | | | | | | | | | events happen. The only flags, for now, indicate if metadata was updated and are set after each call to av_read_frame(). This comes with the caveat that, on stream start, it might not be set properly as packets might be buffered in AVFormatContext.packet_buffer before being given to the user in av_read_frame(). Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '24c788f4878729a42150581d7ed7e9a11daf874d'Michael Niedermayer2014-08-10
|\| | | | | | | | | | | | | | | | | | | * commit '24c788f4878729a42150581d7ed7e9a11daf874d': Remove obsolete FF_API_REFERENCE_DTS cruft. Conflicts: libavformat/avformat.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove obsolete FF_API_REFERENCE_DTS cruft.Anton Khirnov2014-08-09
| |
* | Merge commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b'Michael Niedermayer2014-08-10
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b': Remove obsolete FF_API_PROBE_MIME cruft. Conflicts: libavformat/avformat.h libavformat/format.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove obsolete FF_API_PROBE_MIME cruft.Anton Khirnov2014-08-09
| |
* | Add int64_t probesize2 instead of int probesize to AVFormatContext.Carl Eugen Hoyos2014-07-30
| | | | | | | | | | Allows to set a probesize >2G. Tested-by: Oliver Fromme
* | avformat: fix probe mime version checksMichael Niedermayer2014-07-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '3a19405d574a467c68b48e4b824c76617fd59de0'Michael Niedermayer2014-07-29
|\| | | | | | | | | | | | | | | | | | | | | * commit '3a19405d574a467c68b48e4b824c76617fd59de0': avformat: Use the mime type information in input probe Conflicts: libavformat/format.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Use the mime type information in input probeLuca Barbato2014-07-29
| | | | | | | | | | It should provide a quicker guess for elementary streams provided by http.
* | Merge commit '7215fcf84032118ecd9fb54fb14154d69fea638d'Michael Niedermayer2014-07-27
|\| | | | | | | | | | | | | * commit '7215fcf84032118ecd9fb54fb14154d69fea638d': avformat: Mark AVOutputFormat argument in avformat_query_codec as const Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Mark AVOutputFormat argument in avformat_query_codec as constDiego Biurrun2014-07-26
| |
* | Merge commit 'ec4f04da1a3462dac429b9d15dee5f027309da15'Michael Niedermayer2014-07-27
|\| | | | | | | | | | | | | | | | | | | * commit 'ec4f04da1a3462dac429b9d15dee5f027309da15': avformat: Mark argument in av_{i|o}format_next/ffurl_protocol_next as const Conflicts: libavformat/format.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Mark argument in av_{i|o}format_next/ffurl_protocol_next as constDiego Biurrun2014-07-26
| |
* | avformat: add av_stream_get_parser() to access avformat AVParserMichael Niedermayer2014-07-14
| | | | | | | | | | | | | | | | | | The AVStream.parser field is considered private and its location cannot be preserved while preserving also ABI compatibility to libav, as libav added fields before it. Some tools like ffmpeg.c access this field though Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c9c1265c52910578d3db1a6205c85b91ead0903f'Michael Niedermayer2014-07-09
|\| | | | | | | | | | | | | * commit 'c9c1265c52910578d3db1a6205c85b91ead0903f': avformat: update muxing doxy Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: update muxing doxyAnton Khirnov2014-07-09
| | | | | | | | The callers should now set the stream timebase, not the codec one.
| * avformat_new_stream: make the AVCodec parameter constRoman Savchenko2014-07-08
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avformat/avformat: minor grammar improvementMichael Niedermayer2014-07-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'cdab9db2adeec46b3984309c8c651bdd737d2b6b'Michael Niedermayer2014-07-03
|\| | | | | | | | | | | | | | | | | | | | | * commit 'cdab9db2adeec46b3984309c8c651bdd737d2b6b': lavf: document av_dump_format() Conflicts: libavformat/avformat.h See: 61f96be08a66e74897406fd64da4e61ea4b6a8c5 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: document av_dump_format()Vittorio Giovara2014-07-02
| |
* | Merge commit '194be1f43ea391eb986732707435176e579265aa'Michael Niedermayer2014-06-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '194be1f43ea391eb986732707435176e579265aa': lavf: switch to AVStream.time_base as the hint for the muxer timebase Conflicts: doc/APIchanges libavformat/filmstripenc.c libavformat/movenc.c libavformat/mxfenc.c libavformat/oggenc.c libavformat/swf.h libavformat/version.h tests/ref/lavf/mkv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: switch to AVStream.time_base as the hint for the muxer timebaseAnton Khirnov2014-06-18
| | | | | | | | | | | | | | | | | | | | | | | | Previously, AVStream.codec.time_base was used for that purpose, which was quite confusing for the callers. This change also opens the path for removing AVStream.codec. The change in the lavf-mkv test is due to the native timebase (1/1000) being used instead of the default one (1/90000), so the packets are now sent to the crc muxer in the same order in which they are demuxed (previously some of them got reordered because of inexact timestamp conversion).
* | Allow values >31bit for -analyzeduration.Carl Eugen Hoyos2014-06-10
| |
* | Allow >2G for skip_initial_bytes.Carl Eugen Hoyos2014-06-06
| |
* | Merge commit '6d212599aa684f30511fb08ca30fe2378405304e'Michael Niedermayer2014-05-29
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '6d212599aa684f30511fb08ca30fe2378405304e': avformat: Provide a standard compliance flag Conflicts: doc/APIchanges libavformat/avformat.h libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Provide a standard compliance flagLuca Barbato2014-05-28
| | | | | | | | | | | | Provide f_strict for avconv usage. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat: move default for max_analyze_duration into utils.cMichael Niedermayer2014-05-26
| | | | | | | | | | | | this way we can do better tha a single fixed constant value Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: add format_probesize to allow tuning the maximum amount of bytes ↵Michael Niedermayer2014-05-25
| | | | | | | | | | | | | | | | | | | | to identify the filetype Currently probesize is cliped at 1mb before being used for format detection. Alternatively this cliping could be removed but this would then tie various things like stream analysis to the file detection. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: add av_stream_get_end_pts()Michael Niedermayer2014-05-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>