summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* 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>
| * lavf: Add DSS demuxerOleksij Rempel2015-02-19
| | | | | | | | | | | | Signed-off-by: Oleksij Rempel <linux@rempel-privat.de> Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avformat/mov: Add simple ACLR atom reading to set the color range of the ↵Kevin Wheatley2015-02-19
| | | | | | | | | | | | | | | | | | | | | | | | | | incomming track for codec's like DNxHD that utilise AVID's proprietary atom. On input ACLR will be used to set colour range no matter which codec it is associated with. No change for when it will be output. Rework mov_read_extradata function to allow detection of truncated atom reads by callers. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: Fix use of uninitialized variable (ret)Michael Niedermayer2015-02-18
| | | | | | | | | | | | Fixed CID1270823 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/ffmenc: Use av_freep() to avoid leaving stale pointers in memoryMichael Niedermayer2015-02-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/ffmenc: Fix memleak of bufMichael Niedermayer2015-02-18
| | | | | | | | | | | | Fixes CID1257015 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '195942ed9b9b563ec86d34b73aa2c1ee8715d59d'Michael Niedermayer2015-02-17
|\| | | | | | | | | | | | | * commit '195942ed9b9b563ec86d34b73aa2c1ee8715d59d': riff: Support QT RLE Animation in avi ('rle ' FourCC) Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Support QT RLE Animation in avi ('rle ' FourCC)Vittorio Giovara2015-02-17
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4'Michael Niedermayer2015-02-17
|\| | | | | | | | | | | | | * commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4': riff: Support ProRes in avi (APCH fourcc) Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Support ProRes in avi (APCH fourcc)Vittorio Giovara2015-02-17
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * nutdec: Check memory allocationsHugo Beauzée-Luyssen2015-02-17
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avformat/movenc: Fix stts_entries allocation checkMichael Niedermayer2015-02-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a8765852158ecb2ae34895fa35ff51dc95c186f9'Michael Niedermayer2015-02-17
|\| | | | | | | | | | | | | | | | | | | * commit 'a8765852158ecb2ae34895fa35ff51dc95c186f9': movenc: Check memory allocations Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Check memory allocationsHugo Beauzée-Luyssen2015-02-17
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'da7e31a240f276836a0b90ca6c0714181b353cc4'Michael Niedermayer2015-02-17
|\| | | | | | | | | | | | | * commit 'da7e31a240f276836a0b90ca6c0714181b353cc4': rmdec: Check memory allocations from ff_rm_alloc_rmstream() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rmdec: Check memory allocations from ff_rm_alloc_rmstream()Hugo Beauzée-Luyssen2015-02-17
| | | | | | | | Bug-Id: CID 1257835
* | Merge commit 'bb7701684c7170dfd5f33a3c7d827265844619f2'Michael Niedermayer2015-02-17
|\| | | | | | | | | | | | | * commit 'bb7701684c7170dfd5f33a3c7d827265844619f2': lavf: Document the codec context initialization Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Document the codec context initializationVittorio Giovara2015-02-17
| | | | | | | | | | | | During remuxing avcodec_copy_context() is discouraged as certain fields (such as codec_tag) could reflect invalid values between input and output contextes.
* | avformat/matroskaenc: Use the correct data type for the chapter timesMichael Niedermayer2015-02-17
| | | | | | | | | | | | Fixes potential integer overflow Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5dc47a2bd52e375ed742c45d08356b45098f458d'Michael Niedermayer2015-02-17
|\| | | | | | | | | | | | | | | | | | | * commit '5dc47a2bd52e375ed742c45d08356b45098f458d': matroskaenc: Validate chapter start and end times Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: Validate chapter start and end timesVittorio Giovara2015-02-17
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1265717
* | avformat/tedcaptionsdec: add () to protect the argument of ERR_CODE()Michael Niedermayer2015-02-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-09 04:46:47 +0000