summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* avformat/flacenc: Use av_clip_uintp2()Michael Niedermayer2015-02-21
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* libavformat/rtpdec: fix issue with conversion from unsigned to signedGilles Chanteperdrix2015-02-21
| | | | | | | | | | | | | When receiving an RTCP packet, the difference between the last RTCP timestamp and the base timestamp may be negative. As these timestamps are of the uint32_t type, the result becomes a large integer. Cast the difference to int32_t to avoid this issue. The result of this issue is very large start times for RTSP streams, and difficulty to restart correctly after a pause. Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'cbdd1806ead8758949f22b4e4f214b035c78e2b9'Michael Niedermayer2015-02-21
|\ | | | | | | | | | | | | | | | | | | | | * commit 'cbdd1806ead8758949f22b4e4f214b035c78e2b9': rtpdec_hevc: Implement parsing of aggregated packets Conflicts: libavformat/rtpdec_hevc.c See: b6f577dbb2afde4111a1820435ab2c5afbf78e12 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_hevc: Implement parsing of aggregated packetsThomas Volkert2015-02-21
| | | | | | | | | | | | | | With significant changes by Martin Storsjö, to use the shared function instead of reimplementing it. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'b878ba03e7e088777cc5083766e0b2a293e716ee'Michael Niedermayer2015-02-21
|\| | | | | | | | | | | | | * commit 'b878ba03e7e088777cc5083766e0b2a293e716ee': rtpdec_hevc: Initialize variables to silence false positive compiler warnings Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_hevc: Initialize variables to silence false positive compiler warningsMartin Storsjö2015-02-21
| | | | | | | | | | | | | | For some reason, clang didn't warn about this prior to using the shared function. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '10e2d8b5562d8729e4eefbcec63a11eb8a0c502c'Michael Niedermayer2015-02-21
|\| | | | | | | | | | | | | * commit '10e2d8b5562d8729e4eefbcec63a11eb8a0c502c': rtpdec_hevc: Use a shared function for parsing parameter sets Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_hevc: Use a shared function for parsing parameter setsMartin Storsjö2015-02-21
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '0de07510844517b615ef2a2e2916f6391ad88687'Michael Niedermayer2015-02-21
|\| | | | | | | | | | | | | | | | | | | | | * commit '0de07510844517b615ef2a2e2916f6391ad88687': rtpdec_h264: Make reusable functions non-static Conflicts: libavformat/rtpdec_formats.h libavformat/rtpdec_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_h264: Make reusable functions non-staticMartin Storsjö2015-02-21
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '16163e6bf2d446c06d4dd053c0852074bb50508d'Michael Niedermayer2015-02-21
|\| | | | | | | | | | | | | | | | | | | * commit '16163e6bf2d446c06d4dd053c0852074bb50508d': rtpdec_h264: Fix nal type counting after refactoring Conflicts: libavformat/rtpdec_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_h264: Fix nal type counting after refactoringMartin Storsjö2015-02-21
| | | | | | | | | | | | This fixes builds with -DDEBUG after f0a874799. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'a3cc519d1f43bf93cc29fd53284a2b8aa6189a9a'Michael Niedermayer2015-02-21
|\| | | | | | | | | | | | | | | | | | | * commit 'a3cc519d1f43bf93cc29fd53284a2b8aa6189a9a': rtpdec_h264: Prepare h264_handle_packet_stap_a for sharing with hevc Conflicts: libavformat/rtpdec_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_h264: Prepare h264_handle_packet_stap_a for sharing with hevcMartin Storsjö2015-02-21
| | | | | | | | | | | | Add a parameter for skipping a number of bytes at the start of each nal. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '48183b3ad45c95e386a4cb02e1a68b53e6835ac5'Michael Niedermayer2015-02-21
|\| | | | | | | | | | | | | * commit '48183b3ad45c95e386a4cb02e1a68b53e6835ac5': rtpdec_h264: Generalize parse_sprop_parameter_sets Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_h264: Generalize parse_sprop_parameter_setsMartin Storsjö2015-02-21
| | | | | | | | | | | | | | Don't write directly into an AVCodecContext, write into given pointers. Signed-off-by: Martin Storsjö <martin@martin.st>
| * hlsenc: write playlist into a temp file and replace the original atomicallyHendrik Leppkes2015-02-20
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * hlsenc: remove the AVIOContext for the playlist from the muxer contextHendrik Leppkes2015-02-20
| | | | | | | | | | | | Its only used in one function, having it in the context serves no purpose. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/hlsenc: Use ff_rename() only for local filesMichael Niedermayer2015-02-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hlsenc: write playlist into a temp file and replace the original atomicallyHendrik Leppkes2015-02-21
| | | | | | | | | | Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/ffmenc: do not fail on missing codecLukasz Marek2015-02-21
| | | | | | | | | | | | | | | | | | | | | | ffm encoder fails when codec is not found. It may happen when stream is being copied. This commit allows to store such stream and provides backward compatibility with version prior 2.5 release. fixes #4266 Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | Merge commit '46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7'Michael Niedermayer2015-02-20
|\| | | | | | | | | | | | | | | | | | | * commit '46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7': rtpdec_h264: Move a leftover comment into h264_handle_packet_stap_a Conflicts: libavformat/rtpdec_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_h264: Move a leftover comment into h264_handle_packet_stap_aMartin Storsjö2015-02-20
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'a335ed767161c6da2815371177cfd5e40f78e5b7'Michael Niedermayer2015-02-20
|\| | | | | | | | | | | | | * commit 'a335ed767161c6da2815371177cfd5e40f78e5b7': rtpdec_h264: Remove an unnecessary check Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_h264: Remove an unnecessary checkMartin Storsjö2015-02-20
| | | | | | | | | | | | | | | | If src_len is too small for nal_size, we already print a warning above, and the next step is to check the while loop condition anyway, so this one serves no purpose. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '176903ce833ce7469f411640e9748a0d549b5285'Michael Niedermayer2015-02-20
|\| | | | | | | | | | | | | * commit '176903ce833ce7469f411640e9748a0d549b5285': rtpdec_h264: Return immediately on errors in h264_handle_packet_stap_a Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_h264: Return immediately on errors in h264_handle_packet_stap_aMartin Storsjö2015-02-20
| | | | | | | | | | | | | | Previously, errors were only logged but the code kept on trying, and never actually returning the error as a return value. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'bb8c6ac840afa69dd37860fdf85da9f4cf1e0ae4'Michael Niedermayer2015-02-20
|\| | | | | | | | | | | | | * commit 'bb8c6ac840afa69dd37860fdf85da9f4cf1e0ae4': rtpdec_h264: Make a parameter pointer const Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_h264: Make a parameter pointer constMartin Storsjö2015-02-20
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '7650caf013f45ebebf128855735a0c6350836ea4'Michael Niedermayer2015-02-20
|\| | | | | | | | | | | | | * commit '7650caf013f45ebebf128855735a0c6350836ea4': rtpdec_h264: Use av_realloc instead of av_malloc+mempcy Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_h264: Use av_realloc instead of av_malloc+mempcyMartin Storsjö2015-02-20
| | | | | | | | | | | | This is similar to what was done for rtpdec_hevc in ced7238cd01. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8bdbf49c6f4d9473183a3c45ec70d611eb6183cd'Michael Niedermayer2015-02-20
|\| | | | | | | | | | | | | * commit '8bdbf49c6f4d9473183a3c45ec70d611eb6183cd': rtpdec_h264: Include the right header for AV_RB16 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_h264: Include the right header for AV_RB16Martin Storsjö2015-02-20
| | | | | | | | | | | | | | Including libavcodec/get_bits.h is superfluous for AV_RB16 - nothing in this file uses any actual bitstream reader. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'ba2e07909b848e583245856a59d0fe1dd08f917e'Michael Niedermayer2015-02-20
|\| | | | | | | | | | | | | * commit 'ba2e07909b848e583245856a59d0fe1dd08f917e': rtpdec_vp8: Set the keyframe flag Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_vp8: Set the keyframe flagMartin Storsjö2015-02-20
| | | | | | | | | | | | | | This allows the output to be used with stream copy, which discards packet from the start until the first keyframe. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/omadec: Use 64bit for ret to avoid overflowMichael Niedermayer2015-02-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/vqf: Use 64bit for ret to avoid overflowMichael Niedermayer2015-02-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/wtvdec: Use 64bit for ret to avoid overflowMichael Niedermayer2015-02-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mvdec: Use 64bit for ret to avoid overflowMichael Niedermayer2015-02-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/apngdec: Use 64bit for ret to avoid overflowMichael Niedermayer2015-02-20
| | | | | | | | | | | | Missed this hunk in first commit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/gxf: Use 64bit for res to avoid overflowMichael Niedermayer2015-02-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/idcin: Use 64bit for ret to avoid overflowMichael Niedermayer2015-02-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/apngdec: Use 64bit ret to avoid overflowMichael Niedermayer2015-02-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfdec: Use 64bit ret to avoid overflowMichael Niedermayer2015-02-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wtvdec: fix integer overflow resulting in errors with large filesRodger Combs2015-02-20
| | | | | | | | | | | | This fixes a regression in 9fbc613f0df1628e7e78bca791fa8833846f8210 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hlsenc: remove the AVIOContext for the playlist from the muxer contextHendrik Leppkes2015-02-20
| | | | | | | | | | | | Its only used in one function, having it in the context serves no purpose. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: Move avid DNxHD padding to the correct spotKevin Wheatley2015-02-20
| | | | | | | | | | | | | | | | | | | | | | | | Outputting DNxHD into .mov containers 'corrupts' following atoms until end of stsd ffmpeg and qtdump could not decode pasp/colr atoms in the files made by ffmpeg, when outputting DNxHD due to the incorrect padding placement. Now we add the padding in the correct place Tidy up FATE changes due to padding changes. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/dss: Use av_freep() to avoid leaving stale pointers in memoryMichael Niedermayer2015-02-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/dss: Check sscanf() return value in dss_read_metadata_date()Michael Niedermayer2015-02-19
| | | | | | | | | | | | | | Fixes writing uninitialized values into metadata without error in case parsing fails Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499'Michael Niedermayer2015-02-19
|\| | | | | | | | | | | | | | | | | | | | | * commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499': lavf: Add DSS demuxer Conflicts: libavformat/Makefile libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>