summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* lavf/matroska: Removing experimental suffix for OpusVignesh Venkatasubramanian2013-09-12
| | | | | | | | | Removing the /EXPERIMENTAL suffix for codec id field for Opus. Doing this as the implementation of embedding Opus in Matroska is complete. Signed-Off By: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-09-12
|\ | | | | | | | | | | | | | | | | | | * cehoyos/master: Set bits_per_raw_sample when reading j2k frames. libopenjpegdec.c: Correctly scale gray16 output if precision < 16 Use rc_max_rate if no video bit_rate was specified when muxing mxf_d10. Store the video bit_rate in the context when muxing mxf. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Use rc_max_rate if no video bit_rate was specified when muxing mxf_d10.Carl Eugen Hoyos2013-09-12
| | | | | | | | | | | | Fixes ticket #2945. Reviewed-by: Matthieu Bouron
| * Store the video bit_rate in the context when muxing mxf.Carl Eugen Hoyos2013-09-12
| | | | | | | | | | | | This will allow using rc_max_rate if no bit_rate is specified (on remuxing). Reviewed-by: Matthieu Bouron
* | vformat/smacker: use av_freep() to ensure no stale pointers remainMichael Niedermayer2013-09-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: matroskaenc: Fix stray pointers left over from av_reallocp_array refactoring Conflicts: libavformat/matroskaenc.c Mostly not merged as the buggy code was no longer part of FFmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | matroskaenc: Fix stray pointers left over from av_reallocp_array refactoringAlexandra Khirnova2013-09-12
| | | | | | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | | Merge commit 'c0779a67e85df856904ee6fab760c4233d4c2be5'Michael Niedermayer2013-09-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c0779a67e85df856904ee6fab760c4233d4c2be5': mp3: add .mpa extension Conflicts: libavformat/mp3dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mp3: add .mpa extensionVittorio Giovara2013-09-12
| | | | | | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | | Merge commit '17d57848fc14e82f76a65ffb25c90f2f011dc4a0'Michael Niedermayer2013-09-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '17d57848fc14e82f76a65ffb25c90f2f011dc4a0': mpc8: Make sure the first stream exists before parsing the seek table Conflicts: libavformat/mpc8.c See: 69fb605ad5e0f1384ca4d06d38ce0f1b6c8c286d Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mpc8: Make sure the first stream exists before parsing the seek tableMartin Storsjö2013-09-12
| | | | | | | | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit '459f2b393a3f89ed08d10fbceb4738d1429f268e'Michael Niedermayer2013-09-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '459f2b393a3f89ed08d10fbceb4738d1429f268e': mpc8: Check the seek table size parsed from the bitstream Conflicts: libavformat/mpc8.c See: b61ba262a1e275f8129b7383d70fe48051b47fcf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mpc8: Check the seek table size parsed from the bitstreamMartin Storsjö2013-09-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Limit the size to INT_MAX/2 (for simplicity) to be sure that size + FF_INPUT_BUFFER_PADDING_SIZE won't overflow. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit '183b9d843a9533774fabd3984a52f3987001acbc'Michael Niedermayer2013-09-12
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '183b9d843a9533774fabd3984a52f3987001acbc': ape: Don't allow the seektable to be omitted See: e7cb161515fc9fb6d30d1681d64d9ba7ad737a4e Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | ape: Don't allow the seektable to be omittedMartin Storsjö2013-09-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | The seektable is required for filling in ape->frames[i].pos further down. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit '710b0e27025948b7511821c2f888ff2d74a59e14'Michael Niedermayer2013-09-12
|\| | | | | | | | | | | | | | | | | | | | * commit '710b0e27025948b7511821c2f888ff2d74a59e14': smacker: Avoid integer overflow when allocating packets Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | smacker: Avoid integer overflow when allocating packetsMartin Storsjö2013-09-11
| | | | | | | | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit '8d928023f953a28692ba27071a448259134b103b'Michael Niedermayer2013-09-12
|\| | | | | | | | | | | | | | | | | | | | * commit '8d928023f953a28692ba27071a448259134b103b': smacker: Don't return packets in unallocated streams Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | smacker: Don't return packets in unallocated streamsMartin Storsjö2013-09-11
| | | | | | | | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit '48d6556dd46d4f4fac10d0f4a819e314887cd50e'Michael Niedermayer2013-09-12
|\| | | |/ |/| | | | | | | | | * commit '48d6556dd46d4f4fac10d0f4a819e314887cd50e': dsicin: Add some basic sanity checks for fields read from the file Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsicin: Add some basic sanity checks for fields read from the fileMartin Storsjö2013-09-11
| | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/nutdec: check for allocation failuresPaul B Mahol2013-09-11
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/utils: use av_realloc_array()Michael Niedermayer2013-09-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec: use av_realloc_array()Michael Niedermayer2013-09-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskaenc: use av_realloc_array()Michael Niedermayer2013-09-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskadec: use av_realloc_array()Michael Niedermayer2013-09-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskaenc: use av_freep() to avoid leaving stale pointersMichael Niedermayer2013-09-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfenc: use av_freep() for extra safteyMichael Niedermayer2013-09-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/gxfenc: Clear nb_fields on array deallocationMichael Niedermayer2013-09-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/gxfenc: Check and propagate return code from gxf_write_map_packet()Michael Niedermayer2013-09-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/smacker: check avformat_new_stream() return valuePaul B Mahol2013-09-11
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/libnut: check avformat_new_stream() return valuePaul B Mahol2013-09-11
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/ffmetadec: return meaningful error codesPaul B Mahol2013-09-11
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/sierravmd: check for memory allocation failuresPaul B Mahol2013-09-11
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/flic: check for memory allocation failuresPaul B Mahol2013-09-11
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/utils: functions that add entries should not destroy the whole list ↵Michael Niedermayer2013-09-11
| | | | | | | | | | | | | | | | | | | | | | on failure The caller does not expect this, and in case of adding new streams would then not even be able to deallocate them anymore. This reverts a hunk from "avformat: Use av_reallocp_array() where suitable" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec: functions that add entries should not destroy the whole ↵Michael Niedermayer2013-09-11
| | | | | | | | | | | | | | | | | | | | | | list on failure The caller does not expect this and there are variables left that index to otherwise deallocated data. This reverts a hunk from "avformat: Use av_reallocp_array() where suitable" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskaenc: functions that add entries should not destroy the ↵Michael Niedermayer2013-09-11
| | | | | | | | | | | | | | | | whole list on failure This reverts a hunk from "avformat: Use av_reallocp_array() where suitable" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskadec: ebml_parse_elem() should not deallocate priorly ↵Michael Niedermayer2013-09-11
| | | | | | | | | | | | | | | | existing lists on failure This reverts a hunk from "avformat: Use av_reallocp_array() where suitable" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f369b9356c4606cd4d713d60f7db5de119d901fa'Michael Niedermayer2013-09-11
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'f369b9356c4606cd4d713d60f7db5de119d901fa': avformat: Use av_reallocp_array() where suitable Conflicts: libavformat/asfenc.c libavformat/gxfenc.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Use av_reallocp_array() where suitableAlexandra Khirnova2013-09-10
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | opus/matroska: Adding support for End Trimming in demuxer/decoderVignesh Venkatasubramanian2013-09-10
| | | | | | | | | | | | | | | | | | Implementing support for end trimming Opus in Matroska by making use of the DiscardPadding value from the container and discarding the samples accordingly. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/riff: add 0x594a TwoCCPiotr Bandurski2013-09-10
| | | | | | | | | | | | | | | | sample: http://samples.mplayerhq.hu/game-formats/wc4-xan/crusader-no-regret.avi Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-10
|\| | | | | | | | | | | | | | | | | | | * qatar/master: movenc: Simplify setting the fragmentation flag Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Simplify setting the fragmentation flagMartin Storsjö2013-09-09
| | | | | | | | | | | | | | This makes sure the faststart vs fragmentation check works as intended when fragmentation is enabled due to using the ismv mode. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8b524ab0c43c1767919530abb79d3656113cdc47'Michael Niedermayer2013-09-10
|\| | | | | | | | | | | | | | | | | | | * commit '8b524ab0c43c1767919530abb79d3656113cdc47': movenc: Add a warning message if conflicting options have been specified Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Add a warning message if conflicting options have been specifiedMartin Storsjö2013-09-09
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * tcp: Explicitly convert a pointer to a boolean integerMartin Storsjö2013-09-09
| | | | | | | | | | | | | | | | | | This fixes warnings about making integers from pointers without a cast, and avoids the theoretical case where the lower 32 bits of the pointer would all be zero where the implicit cast wouldn't give the right result. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-09-10
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Use 0x88 as stream id when muxing DTS in program streams. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Use 0x88 as stream id when muxing DTS in program streams.Carl Eugen Hoyos2013-09-10
| | | | | | | | | | | | | | | | | | This is what other open source software uses and what some hardware players expect. Tested by trac user iuqbgq9h-1 at yahoo
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-23 14:59:07 +0000