summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | | avcodec/fraps: increase vlc nb_bitsMichael Niedermayer2013-10-01
| | | | | | | | | | | | | | | | | | | | | | | | This should fix decoding the file in: http://ffmpeg.gusari.org/viewtopic.php?f=16&t=1078 No i dont have the file so i cant test Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | configure: fix logic for threads in case of OpenCL is enabled. Fixes ticket ↵Thilo Borgmann2013-10-01
| | | | | | | | | | | | | | | | | | | | | 3004. Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | swscale/utils: dont divide by zero with zero vectorsMichael Niedermayer2013-10-01
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | swscale: make bilinear scaling the defaultwm42013-09-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | Before this commit, sws_init_context() failed with an error if no scaler was explicitly set. Defaulting to something reasonable is better behavior. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | fate: add fieldorder testPaul B Mahol2013-09-30
| | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | | doc: move sws_dither option description to scaler.texiStefano Sabatini2013-09-30
| | | | | | | | | | | | | | | That's the more proper place where the scaler options should be documented.
* | | doc/filters/scale: mention and link scaler optionsStefano Sabatini2013-09-30
| | |
* | | doc/filters/scale: fix MAN rendering of @ref argumentsStefano Sabatini2013-09-30
| | |
* | | doc: try to add a link from the vf_scale sws_flags to the scaler docsMichael Niedermayer2013-09-30
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avfilter/vf_hflip: support slice threadingPaul B Mahol2013-09-30
| | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | | avfilter/vf_hflip: refactor plane dimensions calculationPaul B Mahol2013-09-30
| | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | | avfilter/vf_rotate: support slice threadingPaul B Mahol2013-09-30
| | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | | skip_bits: dont call UPDATE_CACHEMichael Niedermayer2013-09-30
| | | | | | | | | | | | | | | | | | UPDATE_CACHE isnt needed and can cause segfaults Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | cmdutils: print command support in -filters.Paul B Mahol2013-09-30
| | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | | configure: fix build with enable-xmm-clobber-testMichael Niedermayer2013-09-30
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | doc/t2h.init: remove resource-type and distribution meta elementsTimothy Gu2013-09-30
| | | | | | | | | | | | | | | | | | | | | The W3C validator complains about these. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-09-30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * cehoyos/master: Avoid img_segment_size == 0 in mtv demuxer. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | | Avoid img_segment_size == 0 in mtv demuxer.Carl Eugen Hoyos2013-09-30
| | | | | | | | | | | | | | | | Fixes ticket #3011.
* | | | avfilter/dualinput: simplifyPaul B Mahol2013-09-30
|/ / / | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-30
|\| | | | | | | | | | | | | | | | | | | | * qatar/master: omadec: fix bitrate for ATRAC3+ streams Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | omadec: fix bitrate for ATRAC3+ streamsMaxim Poliakovski2013-09-29
| | | | | | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | | Merge commit '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3'Michael Niedermayer2013-09-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3': Add support for multichannel ATRAC3+ streams. Conflicts: libavformat/oma.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Add support for multichannel ATRAC3+ streams.Maxim Poliakovski2013-09-29
| | | | | | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | | Merge commit '93370d12164236d59645314871a1d6808b2a8ddb'Michael Niedermayer2013-09-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '93370d12164236d59645314871a1d6808b2a8ddb': mxfdec: set audio timebase to 1/samplerate Conflicts: libavformat/mxfdec.c tests/ref/fate/mxf-demux tests/ref/seek/lavf-mxf tests/ref/seek/lavf-mxf_d10 See: 83cab07a4c7f8ee1521c49e387b7d86de78d1955 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mxfdec: set audio timebase to 1/samplerateAnton Khirnov2013-09-29
| | | | | | | | | | | | | | | | | | | | | | | | Fixes sync in some samples (e.g. bugs 7581 and 8374 in VLC). Based on a commit by Matthieu Bouron <matthieu.bouron@gmail.com> Reported-by: Jean-Baptiste Kempf <jb@videolan.org> CC: libav-stable@libav.org
* | | Merge commit 'ff07ec143ebd3833fd5a3f4b6c00474ac523a31f'Michael Niedermayer2013-09-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ff07ec143ebd3833fd5a3f4b6c00474ac523a31f': pcx: Return an error on broken palette if err_detect is set to 'explode' Conflicts: libavcodec/pcx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | pcx: Return an error on broken palette if err_detect is set to 'explode'Martin Storsjö2013-09-29
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit 'd1d99e3befea5d411ac3aae72dbdecce94f8b547'Michael Niedermayer2013-09-30
|\| | | | | | | | | | | | | | | | | | | | * commit 'd1d99e3befea5d411ac3aae72dbdecce94f8b547': pcx: Check the packet size before assuming it fits a palette Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | pcx: Check the packet size before assuming it fits a paletteMartin Storsjö2013-09-29
| | | | | | | | | | | | | | | | | | | | | | | | This fixes reads out of bounds. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit '7ba0cedbfeff5671b264d1d7e90777057b5714c6'Michael Niedermayer2013-09-30
|\| | | | | | | | | | | | | | | | | | | | * commit '7ba0cedbfeff5671b264d1d7e90777057b5714c6': rpza: Fix a buffer size check Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | rpza: Fix a buffer size checkMartin Storsjö2013-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | We read 2 bytes for 15 out of 16 pixels, therefore we need to have at least 30 bytes, not 16. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit 'aa0dd52434768da64f1f3d8ae92bcf980c1adffc'Michael Niedermayer2013-09-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aa0dd52434768da64f1f3d8ae92bcf980c1adffc': xxan: Disallow odd width See: 77693c541a541661357a0edd5bbaae69c64b2039 See: 8ad9b48c9b5b749df8fbcd59d61278caadc478ca Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | xxan: Disallow odd widthMartin Storsjö2013-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | Decoded data is always written in pairs within this decoder. This fixes writes out of bounds. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit 'fc739b3eefa0b58d64e7661621da94a94dbc8a82'Michael Niedermayer2013-09-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fc739b3eefa0b58d64e7661621da94a94dbc8a82': xan: Only read within the data that actually was initialized Conflicts: libavcodec/xan.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | xan: Only read within the data that actually was initializedMartin Storsjö2013-09-29
| | | | | | | | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit '30db94dc399f6e4ef8905049d9b740556f0fce47'Michael Niedermayer2013-09-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '30db94dc399f6e4ef8905049d9b740556f0fce47': xan: Use bytestream2 to limit reading to within the buffer Conflicts: libavcodec/xan.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | xan: Use bytestream2 to limit reading to within the bufferMartin Storsjö2013-09-29
| | | | | | | | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit '9fb0de86b49e9fb0709a8ad1e1875e35da841887'Michael Niedermayer2013-09-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9fb0de86b49e9fb0709a8ad1e1875e35da841887': pcx: Consume the whole packet if giving up due to missing palette Conflicts: libavcodec/pcx.c See: b4e516e30e7004a0454a9009080c4de38987189a Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | pcx: Consume the whole packet if giving up due to missing paletteMartin Storsjö2013-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we returned 0, meaning successful decoding but 0 bytes consumed, leading to an infinite loop. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit 'a81cad8f86d1feb7e4bfae29e43f3e994935a5c7'Michael Niedermayer2013-09-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a81cad8f86d1feb7e4bfae29e43f3e994935a5c7': pngdec: Stop trying to decode once inflate returns Z_STREAM_END Conflicts: libavcodec/pngdec.c See: 65bf9a44d7b0295e03463fd143499ab5b85d0cb7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | pngdec: Stop trying to decode once inflate returns Z_STREAM_ENDMartin Storsjö2013-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the input buffer contains more data after the deflate stream, the loop previously left running infinitely, with inflate returning Z_STREAM_END. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit 'c231987662194d009dd91bfc57c678e0e70ca161'Michael Niedermayer2013-09-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c231987662194d009dd91bfc57c678e0e70ca161': mov: Make sure the read sample count is nonnegative Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mov: Make sure the read sample count is nonnegativeMartin Storsjö2013-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids setting a negative number of frames, ending up with a negative average frame rate. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit '640a2427aafa774b83316b7a8c5c2bdc28bfd269'Michael Niedermayer2013-09-30
|\| | | | | | | | | | | | | | | | | | | | * commit '640a2427aafa774b83316b7a8c5c2bdc28bfd269': bfi: Add some very basic sanity checks for input packet sizes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | bfi: Add some very basic sanity checks for input packet sizesMartin Storsjö2013-09-29
| | | | | | | | | | | | | | | CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit '9fc7184d1a9af8d97b3fc5c2ef9d0a647d6617ea'Michael Niedermayer2013-09-30
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '9fc7184d1a9af8d97b3fc5c2ef9d0a647d6617ea': bfi: Avoid divisions by zero See: 99a8552dae54fd464f19a00d9e5b92596c5c058a Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | bfi: Avoid divisions by zeroMartin Storsjö2013-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | If a zero-length video packet is to be returned, just return AVERROR(EAGAIN) and switch back to the audio stream. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit 'a9221e39600a31ee13e736e9e47743cde23f0280'Michael Niedermayer2013-09-29
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'a9221e39600a31ee13e736e9e47743cde23f0280': electronicarts: Add more sanity checking for the number of channels Note: This check is probably unnecessary Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | electronicarts: Add more sanity checking for the number of channelsMartin Storsjö2013-09-29
| | | | | | | | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit 'd07aa3f02b73ab1371c13ac7898338380ca0932b'Michael Niedermayer2013-09-29
|\| | | | | | | | | | | | | | | | | | | | * commit 'd07aa3f02b73ab1371c13ac7898338380ca0932b': riffdec: Add sanity checks for the sample rate Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-16 00:14:14 +0000