summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | jpeg2000dec: Propagate error code from get_cox() correctlyMichael Niedermayer2013-06-05
| | | | | | | | | | | | Without this the context state could become inconsistent Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000: check that nreslevels2decode has been initialized before useMichael Niedermayer2013-06-05
| | | | | | | | | | | | | | Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/img2dec: timestamps are 64bitMichael Niedermayer2013-06-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/mem: simplify av_reallocp_array() by using av_realloc_f()Michael Niedermayer2013-06-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/network: remove unused variableMichael Niedermayer2013-06-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-06-05
|\| | | | | | | | | | | | | * qatar/master: apetag: use int64_t for filesize Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * apetag: use int64_t for filesizeAnton Khirnov2013-06-04
| | | | | | | | CC: libav-stable@libav.org
* | Merge commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c'Michael Niedermayer2013-06-05
|\| | | | | | | | | | | | | | | | | | | * commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c': avconv: check that the output format context exists before accessing it Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: check that the output format context exists before accessing itAnton Khirnov2013-06-04
| | | | | | | | Fixes a segfault in exit_program() if opening an output file fails.
* | Merge commit '8b7dffc2d6c6c19f8e0a1fedcd0e95dce7a273ff'Michael Niedermayer2013-06-05
|\| | | | | | | | | | | | | | | | | | | * commit '8b7dffc2d6c6c19f8e0a1fedcd0e95dce7a273ff': lavfi doxy: improve/extend AVFilter doxy. Conflicts: libavfilter/avfilter.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi doxy: improve/extend AVFilter doxy.Anton Khirnov2013-06-04
| |
* | Merge commit '9835abb6d63fb07613994ae90e72fef758149408'Michael Niedermayer2013-06-05
|\| | | | | | | | | | | | | | | | | | | | | * commit '9835abb6d63fb07613994ae90e72fef758149408': network: uniform ff_listen_bind and ff_listen_connect Conflicts: libavformat/network.c libavformat/tcp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * network: uniform ff_listen_bind and ff_listen_connectLuca Barbato2013-06-04
| | | | | | | | | | Document the functions and have both use a millisecond timeout and check for interrupt.
* | Merge commit '7c020e1ad37d27c9d5db4d714401f09c80e3cc44'Michael Niedermayer2013-06-05
|\| | | | | | | | | | | | | * commit '7c020e1ad37d27c9d5db4d714401f09c80e3cc44': movenc: Grow the frag_info array in chunks Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Grow the frag_info array in chunksAndrey Semashev2013-06-04
| | | | | | | | | | | | | | | | Previously it was grown one element at a time, which leads to excessive reallocations. Bug-Id: 525 Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'ab1189766a82a95f108005463cde75f73fcc0ae5'Michael Niedermayer2013-06-05
|\| | | | | | | | | | | | | * commit 'ab1189766a82a95f108005463cde75f73fcc0ae5': movenc: Increase the cluster array allocation by doubling Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Increase the cluster array allocation by doublingAndrey Semashev2013-06-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous allocation increment of 16384 meant that the cluster array was allocated for 0.6 MB initially, which is a bit excessive for cases with fragmentation where only a fraction of that ever actually is used. Therefore, start off at a much smaller value, and increase by doubling (to avoid reallocating too often when writing long non-fragmented mp4 files). Bug-Id: 525 Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e'Michael Niedermayer2013-06-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e': movenc: Keep track of the allocated size for the cluster array mem: Add av_realloc_array and av_reallocp_array Conflicts: doc/APIchanges libavformat/movenc.c libavutil/mem.c libavutil/mem.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Keep track of the allocated size for the cluster arrayAndrey Semashev2013-06-04
| | | | | | | | | | | | | | | | | | | | | | | | | | When writing fragmented mp4, the cluster array is reset when a fragment is written. Instead of starting off reallocating the array only based on the number of current elements in it, keep track of how many elements there were allocated earlier. This avoids reallocating this array needlessly when writing fragmented mp4 files. Bug-Id: 525 Signed-off-by: Martin Storsjö <martin@martin.st>
| * mem: Add av_realloc_array and av_reallocp_arrayMartin Storsjö2013-06-04
| | | | | | | | | | | | These help avoiding overflows and simplify error handling. Signed-off-by: Martin Storsjö <martin@martin.st>
* | doc/encoders: add documentation for libtwolameTimothy Gu2013-06-05
| |
* | swr: dont treat 32 and 24 as equal in simple copy checkMichael Niedermayer2013-06-05
| | | | | | | | | | | | Fixes dithering from 32 to 24 bit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: set scale for 32->32/24 ditherMichael Niedermayer2013-06-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/mp: remove mp=sabStefano Sabatini2013-06-05
| | | | | | | | The filter was ported to a native libavfilter filter.
* | lavfi: port sab filter from libmpcodecsStefano Sabatini2013-06-05
| |
* | swresample: set flags & description and add documentation for output_sample_bitsPaul B Mahol2013-06-04
| | | | | | | | | | | | Allows users to actually use such option. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | swr: Fix dithering of s16 with SIMDMichael Niedermayer2013-06-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: add native_simd_oneMichael Niedermayer2013-06-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/general: update after e4e4add0e3ba7Paul B Mahol2013-06-04
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | pngdec: dont treat mpng like png with key and non keyframesMichael Niedermayer2013-06-04
| | | | | | | | | | | | Fixes Ticket2618 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Use av_log() instead of fprintf() in ffplay.Carl Eugen Hoyos2013-06-04
| | | | | | | | | | | | Fixes ticket #2630. Reviewed-by: Marton Balint
* | tak: simplify ff_tak_check_crc()Paul B Mahol2013-06-04
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | swresample/rematrix: add S32 mixing codeMichael Niedermayer2013-06-04
| | | | | | | | | | | | Needed for dithering S32 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wresample/rematrix_template: fix internal typesMichael Niedermayer2013-06-04
| | | | | | | | | | | | Should make no difference, but future commits will need it Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'lukaszmluki/master'Michael Niedermayer2013-06-04
|\ \ | | | | | | | | | | | | | | | | | | * lukaszmluki/master: ftp: fix using uninitialized value Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | ftp: fix using uninitialized valueLukasz Marek2013-06-04
| | | | | | | | | | | | | | | | | | Fix coverity issue CID 1026777 Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
* | | ffserver: fix null pointer dereferenceMichael Niedermayer2013-06-04
|/ / | | | | | | | | Fixes CID732208 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1dec: Disable dead codeMichael Niedermayer2013-06-04
| | | | | | | | | | | | | | | | | | Fixes CID732197/6 A assert is added to check that the disabled code wont be needed in the future. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/aacdec: add support for reading ape tagsPaul B Mahol2013-06-03
| | | | | | | | | | | | Closes #2634. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | tta: add support for reading ape tagsPaul B Mahol2013-06-03
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | tta: return meaningful error codrsPaul B Mahol2013-06-03
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | flacdec: use init_get_bits8()Paul B Mahol2013-06-03
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge branch 'master' of https://github.com/upsuper/ffmpeg-vdadecMichael Niedermayer2013-06-03
|\ \ | | | | | | | | | | | | | | | | | | * 'master' of https://github.com/upsuper/ffmpeg-vdadec: vda_h264_dec: remove check_format Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | vda_h264_dec: remove check_formatXidorn Quan2013-06-01
| | | | | | | | | | | | Since this function cannot work anymore, this patch simply removes it.
* | | avformat/network: check the return value from setsockopt()Michael Niedermayer2013-06-03
| | | | | | | | | | | | | | | Fixes: CID1026742 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | matroskadec: fix memleak of pkt_dataMichael Niedermayer2013-06-03
| | | | | | | | | | | | | | | Fixes: CID1026767 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | matroskadec: favor av_freep()Michael Niedermayer2013-06-03
| | | | | | | | | | | | | | | | | | av_freep() is safer as it zeros the pointer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avfilter/vf_mcdeint: free frame on errorMichael Niedermayer2013-06-03
| | | | | | | | | | | | | | | Fixes CID1026766 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avfilter/process_options: fix memleakMichael Niedermayer2013-06-03
| | | | | | | | | | | | | | | Fixes CID1026765 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avfilter/af_astats: rename stat()Michael Niedermayer2013-06-03
| | | | | | | | | | | | | | | See CID1026741 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>