summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-08
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Mirillis FIC video decoder Conflicts: Changelog configure libavcodec/Makefile libavcodec/avcodec.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Mirillis FIC video decoderKostya Shishkov2014-02-08
| | | | | | | | | | | | Does not contain cursor rendering yet. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | vorbis: extract metadata from the middle of a streamBen Boeckel2014-02-05
| | | | | | | | | | | | | | | | | | | | | | | | | | If a special comment packet shows up in the middle of the stream, we should extract it out into the vorbis stream metadata dictionary. Also, if there is metadata in the packet on the way in, it might linger since we only add data to the dictionary causing stale metadata to be inserted into the stream. Instead, clear it to remove any doubt about what is new and old. Signed-off-by: Ben Boeckel <mathstuf@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vorbis: append data from tags togetherBen Boeckel2014-02-05
| | | | | | | | | | | | | | | | Currently, if there are multiple 'performer' tags, the last one is the only one which appears. Instead, join them with a semicolon. Signed-off-by: Ben Boeckel <mathstuf@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ogg: allow streams to update metadataBen Boeckel2014-02-05
| | | | | | | | | | Signed-off-by: Ben Boeckel <mathstuf@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/oggparseopus: Setting seek_preroll in AVCodecContextVignesh Venkatasubramanian2014-02-05
| | | | | | | | | | | | | | | | | | Setting seek_preroll value in AVCodecContext for Opus streams embedded in ogg container. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd9ae1031f5edbd25c8526b4cb51aba66d3bee931'Michael Niedermayer2014-02-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd9ae1031f5edbd25c8526b4cb51aba66d3bee931': lavf: improve handling of sparse streams when muxing Conflicts: doc/APIchanges libavformat/avformat.h libavformat/mux.c libavformat/options_table.h libavformat/version.h See: 37ed5df5c5e06a55724fb9eb215da1594b648282 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: improve handling of sparse streams when muxingLuca Barbato2014-02-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently ff_interleave_packet_per_dts() waits until it gets a frame for each stream before outputting packets in interleaved order. Sparse streams (i.e. streams with much fewer packets than the other streams, like subtitles or audio with DTX) tend to add up latency and in specific cases end up allocating a large amount of memory. Emit the top packet from the packet_buffer if it has a time delta larger than a specified threshold. Original report of the issue and initial proposed solution by mus.svz@gmail.com. Bug-id: 31 Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'd509ae5be0a9bac35a4cedbe68b774a74446bb27'Michael Niedermayer2014-02-05
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd509ae5be0a9bac35a4cedbe68b774a74446bb27': jvdec: K&R formatting cosmetics Conflicts: libavcodec/jvdec.c libavformat/jvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jvdec: K&R formatting cosmeticsVittorio Giovara2014-02-04
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '33c859c142ef3f49b7a6227014ad92a680cf4d74'Michael Niedermayer2014-02-04
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '33c859c142ef3f49b7a6227014ad92a680cf4d74': lavf: ignore attachment streams for interleaving purposes Conflicts: libavformat/avformat.h libavformat/internal.h libavformat/mux.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: ignore attachment streams for interleaving purposesAnton Khirnov2014-02-04
| | | | | | | | Those streams should never get any packets by definition.
* | Merge commit '7b03b65bf0d02519c86750d2da33f413e11cf0c6'Michael Niedermayer2014-02-04
|\| | | | | | | | | | | | | * commit '7b03b65bf0d02519c86750d2da33f413e11cf0c6': lavf: do basic sanity checking on muxed packets Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: do basic sanity checking on muxed packetsAnton Khirnov2014-02-04
| | | | | | | | Reject packets for non-existing or attachment streams.
* | libavformat/utils.c: Cosmetics: Fix incorrect comma placementStåle Kristoffersen2014-02-03
| |
* | RoQ encoder: support different integer frameratesaddr-see-the-website@aetey.se2014-02-03
| | | | | | | | | | | | | | Even though the most common framerate for RoQ is 30fps, the format supports other framerates too. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: use AVPROBE_SCORE_STREAM_RETRY, instead of AVPROBE_SCORE_RETRY - 1Michael Niedermayer2014-02-02
| | | | | | | | | | | | This makes the code clearer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: dvd still frames read thru libdvdnav ended up in internal ↵Voyager12014-02-02
| | | | | | | | | | | | | | | | | | | | | | lavf buffer This is the solution we've been using in XBMC for over 2 years for dvd still frames. The problem is that the demuxer asks for probing of the codec in the mpeg stream. This causes lavf to read the whole menu structure into internal buffers. After which, it won't read from input stream anymore and no events triggers. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: add output_ts_offset option to AVFormatContextStefano Sabatini2014-02-02
| | | | | | | | | | This option can be generally useful to set an output offset, needed when setting an absolute index in the output.
* | lavf/avformat.h: fix typosStefano Sabatini2014-02-02
| |
* | libavformat/mtv: add test for audio magicReynaldo H. Verdejo Pinochet2014-02-01
| | | | | | | | | | | | | | MTV files have the string "MP3" as audio magic on their header. Always. Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
* | Merge commit 'c716624853339ea4b1086a3957b334829370204c'Michael Niedermayer2014-02-02
|\| | | | | | | | | | | | | | | | | | | * commit 'c716624853339ea4b1086a3957b334829370204c': mxf: Read field dominance flag Conflicts: libavformat/mxfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Read field dominance flagMatthieu Bouron2014-02-01
| | | | | | | | | | | | And export the information in field_order. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '7d56f2fffc14ad02001ee0689bee76a759da9ede'Michael Niedermayer2014-02-02
|\| | | | | | | | | | | | | | | | | | | | | * commit '7d56f2fffc14ad02001ee0689bee76a759da9ede': mxf: Handle negative edit_rate Conflicts: libavformat/mxfdec.c See: 83cab07a4c7f8ee1521c49e387b7d86de78d1955 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Handle negative edit_rateLuca Barbato2014-02-01
| | | | | | | | Default to 1/25.
* | Auto-detect hevc in mpeg-ts.Ståle Kristoffersen2014-01-31
| | | | | | | | | | | | Fixes decoding of files without PMT/PAT. Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
* | avformat/flac_picture: clear padding areaMichael Niedermayer2014-01-31
| | | | | | | | | | | | | | | | aviod use of uninitialized memory Fixes: asan_heap-oob_1487fa4_4706_cov_364534849_cover_art.flac Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flac_picture: allocate buffer padding for pictureMichael Niedermayer2014-01-31
| | | | | | | | | | | | | | Fixes: heap array overread Fixes: asan_heap-oob_14876d9_4706_cov_815472558_cover_art.flac Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '78987a88a88b28d93d03ed6c228bcb33f178444f'Michael Niedermayer2014-01-31
|\| | | | | | | | | | | | | * commit '78987a88a88b28d93d03ed6c228bcb33f178444f': lavf: include 60 fps in guessed standard frame rates Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: include 60 fps in guessed standard frame ratesJanne Grunau2014-01-31
| | | | | | | | | | Due to what looks like an off-by-one error 60 * 12 * 1001 / 12 * 1001 is not tested as standard frame rate in avformat_find_stream_info().
* | avformat/hdsenc: check mkdir() return codeMichael Niedermayer2014-01-31
| | | | | | | | | | | | | | | | | | This also returns failure if the mkdir failure is not due to an already existing path. Fixed CID1135749 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-29
|\| | | | | | | | | | | | | * qatar/master: avformat: utils: Refactor duplicated PRINT macro Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: utils: Refactor duplicated PRINT macroDiego Biurrun2014-01-29
| |
* | Remove now unneeded Makefile dependency for the wtv muxer.Carl Eugen Hoyos2014-01-29
| |
* | avformat/mpegts: Continue parsing PMTs until at least 2 streams are found or ↵Michael Niedermayer2014-01-29
| | | | | | | | | | | | | | | | | | | | 100kb are reached This (ugly) hack fixes Ticket3348 If someone has an idea on how to fix this nicer, that would be very welcome but the stream contains several PMTs with just one of the 2 streams at the start Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: drop stray spaceMichael Niedermayer2014-01-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support writing E-AC3 in wav.Carl Eugen Hoyos2014-01-29
| |
* | Move GUID-related objects to riffenc.c and riff.c.Carl Eugen Hoyos2014-01-29
| | | | | | | | This simplifies the following eac3-in-wav patch.
* | avformat/hls: Fix cookies and user agent with encrypted HLS streamsMikael Finstad2014-01-28
| | | | | | | | | | | | | | Session data (cookies, user-agent) is not being sent on payload requests with encrypted HLS streams This causes services like Akamai to give a 403 forbidden when requesting the TS files, because they expect the same cookies and user-agent on all requests
* | lavd: add avdevice_dev_to_app_control_message APILukasz Marek2014-01-27
| | | | | | | | | | | | New API allows to send messages from devices to application. Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
* | lavd: add avdevice_app_to_dev_control_message APILukasz Marek2014-01-27
| | | | | | | | | | | | New API allows to send messages from application to devices. Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
* | Merge commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654'Michael Niedermayer2014-01-26
|\| | | | | | | | | | | | | | | | | | | * commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654': avformat: utils: K&R formatting cosmetics Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: utils: K&R formatting cosmeticsDiego Biurrun2014-01-26
| | | | | | | | Also adjust some comment wording / spelling and reorder header #includes.
* | lavf/avienc: cosmetic indentJames Darnley2014-01-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/avienc: use metadata_header_paddingJames Darnley2014-01-24
| | | | | | | | | | | | | | | | The muxer will write at least the number of bytes requested and possibly up to 3 bytes more. This is because the muxer writes 32-bit integers and the format requires 4-byte alignment anyway. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/id3v2enc: update comment about minimum paddingJames Darnley2014-01-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/id3v2enc: use metadata_header_paddingJames Darnley2014-01-24
| | | | | | | | | | | | | | As with the change to flacenc this allows the user to control the amount of padding they want added to the file. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/flacenc: fix comment after previous changeJames Darnley2014-01-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/flacenc: use metadata_header_paddingJames Darnley2014-01-24
| | | | | | | | | | | | | | | | | | Allows a user to control the amount, if any, of padding they want added to the file. If set to zero the block will not be written at all. If set to some positive number four more bytes will be added to the file due to the small header required for the block. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | AVFormatContext: add metadata_header_padding fieldJames Darnley2014-01-24
| | | | | | | | | | | | | | | | | | | | | | | | This field is used to store the number of bytes that should be written as padding to a metadata header of a file. For example: - The FLAC format's METADATA_BLOCK_PADDING [1] - The ID3v2 tag format's padding [2] [1] http://xiph.org/flac/format.html#metadata_block_padding [2] http://id3.org/id3v2.3.0#ID3v2_overview Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-17 06:37:48 +0000