summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
...
| * mov: Correctly check the color transfer characteristics rangeVittorio Giovara2014-10-15
| | | | | | | | Reported-by: Ruoyu <liangry@ucweb.com>
* | avformat/mov: auodetect "use_mfra_for"Michael Niedermayer2014-10-15
| | | | | | | | | | Reviewed-by: Mika Raento <mikie@iki.fi> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rtsp: check memory allocationMichael Lynch2014-10-15
| | | | | | | | | | | | Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Commit message by: Benoit Fouet <benoit.fouet@free.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/assdec: typo fixClément Bœsch2014-10-15
| |
* | avformat/assenc: support remuxing old V4 ASS form (SSA)Clément Bœsch2014-10-15
| |
* | Merge commit 'e5cfc8fdad901c9487fe896421972852f38bcf5'Michael Niedermayer2014-10-15
|\| | | | | | | | | | | | | * commit 'e5cfc8fdad901c9487fe896421972852f38bcf5': sdp: Provide out of bound parameter sets for HEVC if extradata is set Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sdp: Provide out of bound parameter sets for HEVC if extradata is setMartin Storsjö2014-10-15
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '9b7f932ee568cadfc0f556a061fcc00cb63f9780'Michael Niedermayer2014-10-15
|\| | | | | | | | | | | | | * commit '9b7f932ee568cadfc0f556a061fcc00cb63f9780': rtpdec_hevc: Parse out of band vps/sps/pps/sei from fmtp lines Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_hevc: Parse out of band vps/sps/pps/sei from fmtp linesMartin Storsjö2014-10-15
| | | | | | | | | | | | These are assembled into extradata in the order vps/sps/pps/sei. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/utils: use av_reduce() to simplify code and avoid overflow in ↵Michael Niedermayer2014-10-15
| | | | | | | | | | | | ff_compute_frame_duration() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '2d6e58497e76836604364b037df9b00ba3d75b69'Michael Niedermayer2014-10-15
|\| | | | | | | | | | | | | | | | | | | * commit '2d6e58497e76836604364b037df9b00ba3d75b69': lavf: switch to AVCodecContext.framerate for demuxing Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: switch to AVCodecContext.framerate for demuxingAnton Khirnov2014-10-15
| |
* | avformat/mxfdec: cleanup if parsing the header metadata failsMichael Niedermayer2014-10-15
| | | | | | | | | | | | | | Fixes memleaks Fixes: asan_static-oob_87d116_10_201.mxf Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec: Fix memleak of packages_refsMichael Niedermayer2014-10-15
| | | | | | | | | | | | Fixes: asan_static-oob_87d116_10_201.mxf Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec: Fix memleak of primer_packsMichael Niedermayer2014-10-15
| | | | | | | | | | | | Fixes: asan_static-oob_87d116_10_201.mxf Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec: Fix termination of mxf_data_essence_container_ulsMichael Niedermayer2014-10-15
| | | | | | | | | | | | Fixes: asan_static-oob_87d116_10_201.mxf Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a74f8121d88e0bdf0d69c22e4b3713032da9300a'Michael Niedermayer2014-10-14
|\| | | | | | | | | | | | | * commit 'a74f8121d88e0bdf0d69c22e4b3713032da9300a': mov: Handle tfdt atoms Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Handle tfdt atomsMartin Storsjö2014-10-14
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'c2c22c75cf89e2faab34d1ee1d392cfb065439ea'Michael Niedermayer2014-10-14
|\| | | | | | | | | | | | | * commit 'c2c22c75cf89e2faab34d1ee1d392cfb065439ea': movenc: Write tfdt atoms Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Write tfdt atomsMartin Storsjö2014-10-14
| | | | | | | | | | | | | | | | | | | | | | These allow getting the absolute start timestamp of a fragment without reading preceding timestamps. This fixes sync between tracks if starting from fragments in different streams that don't align exactly. This also is a prerequisite for producing DASH content. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/mp3enc: use initial_paddingMichael Niedermayer2014-10-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'eabdc2a830f1ab1a3f12243eb7e2fba801cb81f0'Michael Niedermayer2014-10-14
|\| | | | | | | | | | | | | | | | | | | * commit 'eabdc2a830f1ab1a3f12243eb7e2fba801cb81f0': lavf: use initial_padding instead of deprecated delay Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: use initial_padding instead of deprecated delayAnton Khirnov2014-10-13
| |
* | avformat/utils: print more information with av_dlog() in compute_pkt_fields()Michael Niedermayer2014-10-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: add support for syncframes concatenation for E-AC-3.Benoit Fouet2014-10-13
| | | | | | | | | | | | | | E-AC-3 samples should contain 6 audio blocks, so concatenate syncframes in order to achieve this. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: fix mix of declaration and statementMichael Niedermayer2014-10-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov.c: allow reading fragment start dts/pts from fragmented mp4Mika Raento2014-10-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces a new option to the mov demuxer: -use_mfra_for (pts|dts). When it's given and moofs and a MFRA are present, the MFRA's TFRAs are read for fragment start times. Unfortunately some programs that produce fragmented mp4s use the TFRA time field for dts and some for pts. There is no realistic way to detect which is the case, hence the responsibility is punted onto the user. This also means that no behavioural change is enabled by default - you must pass either dts or pts for anything to happen. Without this change, timestamps for some discontinuous fragmented mp4 are wrong, and cause audio/video desync and are not usable for generating HLS. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '76c70e33d2244a688832f03b53862eb5d9ad3b01'Michael Niedermayer2014-10-13
|\| | | | | | | | | | | | | * commit '76c70e33d2244a688832f03b53862eb5d9ad3b01': icecast: Do not use chunked post Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * icecast: Do not use chunked postMark McGough2014-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | Icecast uses HTTP 1.0 while Libav uses HTTP 1.1 and enables by default chunked post. Icecast actually forwards the HTTP chunk headers to the listener as part of the media stream (without the chunk encoding HTTP headers) causing the players to lose sync. Disabling the option is enough to feed icecast properly. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'e44ee1eb8db7393e9d43207c2e1812720e292e6d'Michael Niedermayer2014-10-13
|\| | | | | | | | | | | | | * commit 'e44ee1eb8db7393e9d43207c2e1812720e292e6d': movenc: Simplify code by using an existing local pointer Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Simplify code by using an existing local pointerMartin Storsjö2014-10-12
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'dad12ce452a9d69c0d9d53c375003947d5f1b02e'Michael Niedermayer2014-10-13
|\| | | | | | | | | | | | | | | | | | | * commit 'dad12ce452a9d69c0d9d53c375003947d5f1b02e': movenc: Print a warning for an unhandled case of nonzero start dts with empty_moov Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Print a warning for an unhandled case of nonzero start dts with ↵Martin Storsjö2014-10-12
| | | | | | | | | | | | empty_moov Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'dbb472cb2f2f799295a12b4922a6a8be2cccfdee'Michael Niedermayer2014-10-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dbb472cb2f2f799295a12b4922a6a8be2cccfdee': movenc: Write edit lists for fragmented files as well, if necessary Conflicts: libavformat/movenc.c The default for writing EDTS for fragmented mp4 is left at disabled this can be overridden via command line with -use_editlist but EDTS + fragments still does not fully work, which is why it is left disabled by default Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Write edit lists for fragmented files as well, if necessaryMartin Storsjö2014-10-12
| | | | | | | | | | | | | | | | | | | | | | This is necessary to get the right timestamp offset for content that starts with dts != 0. This currently only helps when writing fragmented files with a non-empty moov atom. When writing an empty moov atom, we don't have any packets yet, so we don't know the starting dts for the tracks. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '95ee4e2ce774e0339632d067161596bf3dadfc72'Michael Niedermayer2014-10-12
|\| | | | | | | | | | | | | * commit '95ee4e2ce774e0339632d067161596bf3dadfc72': movenc: Add some comments explaining subtle details in writing the edit lists Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Add some comments explaining subtle details in writing the edit listsMartin Storsjö2014-10-12
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '72f801619a1ae91969fee9a7d72519422433c998'Michael Niedermayer2014-10-12
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '72f801619a1ae91969fee9a7d72519422433c998': movenc: Adjust edit lists to trim out parts of tracks with negative pts Conflicts: libavformat/movenc.c See: 66b45d8f7a1bfba1065286361ab571cb9cfd87c6 See: 14fd34d73bb0bcb227b62506fb51d63751c9b190 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Adjust edit lists to trim out parts of tracks with negative ptsMichael Niedermayer2014-10-12
| | | | | | | | | | | | | | | | | | This makes sure that audio preroll for e.g. AAC is signaled correctly. Previously we only wrote the edit list correctly if we had negative dts but started with pts == 0 (e.g. for video with B-frames). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8bef43388132b53f59a6e90add18900a3bb4cc60'Michael Niedermayer2014-10-12
|\| | | | | | | | | | | | | * commit '8bef43388132b53f59a6e90add18900a3bb4cc60': smoothstreamingenc: Simplify code by removing a redundant variable Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * smoothstreamingenc: Simplify code by removing a redundant variableMartin Storsjö2014-10-12
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * lavf: Don't drop both pts and dts if timestamps are invalidMichael Niedermayer2014-10-12
| | | | | | | | | | | | | | | | | | In these cases, only drop dts. Because if we drop both we have no timestamps at all for some files. This improves playback of HLS streams from GoPro cameras. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '1d4579e38ecad578c86516fad2837a273d11b320'Michael Niedermayer2014-10-11
|\| | | | | | | | | | | | | | | | | | | | | * commit '1d4579e38ecad578c86516fad2837a273d11b320': tcp: Add AVOption support Conflicts: libavformat/tcp.c See: 2e009c6042bde419599ebed9165e597bbef23b2f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tcp: Add AVOption supportLuca Barbato2014-10-10
| |
* | avformat/assenc: make sure we crawl extradata only if it's non-nullClément Bœsch2014-10-10
| |
* | Merge commit 'cd9d6399fd00f5aeacaa90cdc0b74c3570024119'Michael Niedermayer2014-10-10
|\| | | | | | | | | | | | | | | * commit 'cd9d6399fd00f5aeacaa90cdc0b74c3570024119': tls: Support passing old-style tcp options See: 4f4eb380f0f96dbb7cdd2b812fa92b8b47a0f27c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tls: Support passing old-style tcp optionsLuca Barbato2014-10-10
| | | | | | | | Make tcp and tls urls near-interchangeable.
* | Merge commit '3df8d52fcdc9036b4074fdc612d487ece8bb5b7f'Michael Niedermayer2014-10-10
|\| | | | | | | | | | | | | * commit '3df8d52fcdc9036b4074fdc612d487ece8bb5b7f': rtsp: Add rtsps to the probe Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: Add rtsps to the probeLuca Barbato2014-10-10
| |
* | Merge commit 'c839b0439f0b01c72a6d253920d2e342b30f8bcb'Michael Niedermayer2014-10-10
|\| | | | | | | | | | | | | * commit 'c839b0439f0b01c72a6d253920d2e342b30f8bcb': rtsp: Support tls when in listen mode Merged-by: Michael Niedermayer <michaelni@gmx.at>