Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-09-12avfilter: various cosmeticsPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-12Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2013-09-12MAINTAINERS: move sections from lavc to lavuStefano Sabatini
Reflect current code organization.
2013-09-12Merge commit 'c0779a67e85df856904ee6fab760c4233d4c2be5'Michael Niedermayer
* commit 'c0779a67e85df856904ee6fab760c4233d4c2be5': mp3: add .mpa extension Conflicts: libavformat/mp3dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12Merge commit 'e2cd766ca1b9bb2ba72aca5f6ba5d8be15743984'Michael Niedermayer
* commit 'e2cd766ca1b9bb2ba72aca5f6ba5d8be15743984': configure: Mention that icl does not build both static and shared libs Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12Merge commit 'b1e469885362febce3d9a4678624e44a92f77da9'Michael Niedermayer
* commit 'b1e469885362febce3d9a4678624e44a92f77da9': g2meet: Allocate cursor buffers large enough to fit the aligned width See: 3c4c5ca1c194464f51de87534d15602f99bf9759 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12Merge commit '0f678c0214dccb355ed8955077a2bea46984fbc8'Michael Niedermayer
* commit '0f678c0214dccb355ed8955077a2bea46984fbc8': aic: Validate values read from the bitstream Conflicts: libavcodec/aic.c See: 657875b145c788d29b8e3bf38f79264e657932ae Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12Merge commit '17d57848fc14e82f76a65ffb25c90f2f011dc4a0'Michael Niedermayer
* 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>
2013-09-12Merge commit '459f2b393a3f89ed08d10fbceb4738d1429f268e'Michael Niedermayer
* 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>
2013-09-12Merge commit '0d61f260010707f3028b818e8b24598e1a83d696'Michael Niedermayer
* commit '0d61f260010707f3028b818e8b24598e1a83d696': zmbvdec: Check the buffer size for uncompressed data Conflicts: libavcodec/zmbv.c See: 44c23aa1b85d195db6647d24e3b1d3de051790db Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12Merge commit '183b9d843a9533774fabd3984a52f3987001acbc'Michael Niedermayer
* commit '183b9d843a9533774fabd3984a52f3987001acbc': ape: Don't allow the seektable to be omitted See: e7cb161515fc9fb6d30d1681d64d9ba7ad737a4e Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12Merge commit 'b26742cc308552f242ee2bf93b07a3ff509f4edc'Michael Niedermayer
* commit 'b26742cc308552f242ee2bf93b07a3ff509f4edc': shorten: Break out of loop looking for fmt chunk if none is found See: 5e9a56a0350c518cd4b38845aff49d41a9c952ae Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12Merge commit '49568851bf1700e3d9ea9cda29208d0df3c2c38b'Michael Niedermayer
* commit '49568851bf1700e3d9ea9cda29208d0df3c2c38b': shorten: Use a checked bytestream reader for the wave header Conflicts: libavcodec/shorten.c See: 5e9a56a0350c518cd4b38845aff49d41a9c952ae Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12matroskaenc: Fix stray pointers left over from av_reallocp_array refactoringAlexandra Khirnova
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-09-12mp3: add .mpa extensionVittorio Giovara
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-09-12configure: Mention that icl does not build both static and shared libsDiego Biurrun
2013-09-12Merge commit 'f3d57dc69145f1b7acb4870da9ce60378190a1fd'Michael Niedermayer
* commit 'f3d57dc69145f1b7acb4870da9ce60378190a1fd': smacker: Free memory properly if the init function fails Conflicts: libavcodec/smacker.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12Merge commit '0679cec6e8802643bbe6d5f68ca1110a7d3171da'Michael Niedermayer
* commit '0679cec6e8802643bbe6d5f68ca1110a7d3171da': smacker: Make sure we don't fill in huffman codes out of range Conflicts: libavcodec/smacker.c See: 1285baaab550e3e761590ef6dfb1d9bd9d1332e4 the added test is redundant but will be used after future refactoring Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12Merge commit 'd002fce24a7206e95f9492031f45adc35711e183'Michael Niedermayer
* commit 'd002fce24a7206e95f9492031f45adc35711e183': smacker: Check malloc return values Conflicts: libavcodec/smacker.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12Merge commit '710b0e27025948b7511821c2f888ff2d74a59e14'Michael Niedermayer
* commit '710b0e27025948b7511821c2f888ff2d74a59e14': smacker: Avoid integer overflow when allocating packets Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12Merge commit '8d928023f953a28692ba27071a448259134b103b'Michael Niedermayer
* commit '8d928023f953a28692ba27071a448259134b103b': smacker: Don't return packets in unallocated streams Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12Merge commit '48d6556dd46d4f4fac10d0f4a819e314887cd50e'Michael Niedermayer
* commit '48d6556dd46d4f4fac10d0f4a819e314887cd50e': dsicin: Add some basic sanity checks for fields read from the file Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12Merge commit '5045f6bdfabfa5d3374756d2c23f762fb042acae'Michael Niedermayer
* commit '5045f6bdfabfa5d3374756d2c23f762fb042acae': configure: Fix wrong reference to user support mailing list Conflicts: configure No change as the reference was not wrong in ffmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12g2meet: Allocate cursor buffers large enough to fit the aligned widthMartin Storsjö
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-12aic: Validate values read from the bitstreamMartin Storsjö
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-12mpc8: Make sure the first stream exists before parsing the seek tableMartin Storsjö
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-12mpc8: Check the seek table size parsed from the bitstreamMartin Storsjö
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>
2013-09-12zmbvdec: Check the buffer size for uncompressed dataMichael Niedermayer
Also don't pointlessly set the buffer size to 1 after copying one packet. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-12ape: Don't allow the seektable to be omittedMartin Storsjö
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>
2013-09-12shorten: Break out of loop looking for fmt chunk if none is foundMartin Storsjö
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-12shorten: Use a checked bytestream reader for the wave headerMartin Storsjö
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-11lavu/sha512: Fully unroll the transform function loopsJames Almer
crypto_bench SHA-512 results using an AMD Athlon X2 7750+, mingw32-w64 GCC 4.7.3 x86_64 Before: lavu SHA-512 size: 1048576 runs: 1024 time: 12.737 +- 0.147 After: lavu SHA-512 size: 1048576 runs: 1024 time: 11.670 +- 0.173 Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-11lavu/sha: Fully unroll the transform function loopsJames Almer
crypto_bench SHA-1 and SHA-256 results using an AMD Athlon X2 7750+, mingw32-w64 GCC 4.7.3 x86_64 Before: lavu SHA-1 size: 1048576 runs: 1024 time: 9.012 +- 0.162 lavu SHA-256 size: 1048576 runs: 1024 time: 19.625 +- 0.173 After: lavu SHA-1 size: 1048576 runs: 1024 time: 7.948 +- 0.154 lavu SHA-256 size: 1048576 runs: 1024 time: 17.841 +- 0.170 Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-11smacker: Free memory properly if the init function failsMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-11smacker: Make sure we don't fill in huffman codes out of rangeMartin Storsjö
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-11smacker: Check malloc return valuesMartin Storsjö
Also try to free local allocations on errors. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-11smacker: Avoid integer overflow when allocating packetsMartin Storsjö
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-11smacker: Don't return packets in unallocated streamsMartin Storsjö
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-11dsicin: Add some basic sanity checks for fields read from the fileMartin Storsjö
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-11avfilter: remove redundant use of AV_NE() macroPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-11avformat/nutdec: check for allocation failuresPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-11avfilter/vf_traspose: move switch out of loopPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-11avcodec: add const qualifier to avcodec_find_best_pix_fmt2 argsDylan Alex Simon
avcodec_find_best_pix_fmt2 does not modify its first argument so may be marked const. This avoids a warning when passing in AVCodec.pix_fmts. Signed-off-by: Dylan Simon <dylan@dylex.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-11configure: Fix wrong reference to user support mailing listDiego Biurrun
2013-09-11avformat/utils: use av_realloc_array()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-11avformat/mxfdec: use av_realloc_array()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-11avformat/matroskaenc: use av_realloc_array()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-11avformat/matroskadec: use av_realloc_array()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-11avformat/matroskaenc: use av_freep() to avoid leaving stale pointersMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-11avformat/asfenc: use av_freep() for extra safteyMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>