aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* lavfi/histogram: cache log2 of max_hvalPaul B Mahol2013-05-191-5/+6
| | | | | | Instead of calculating same value over and over again. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* swscale/output: silence warning about undefined 'ASSERT_LEVEL'Paul B Mahol2013-05-191-1/+1
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* swscale/output: remove unused headerPaul B Mahol2013-05-191-1/+0
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* ffv1dec: defuse membombMichael Niedermayer2013-05-191-1/+1
| | | | | | Fixes Ticket2589 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* configure: use the user specified valgrind excutable for massifMichael Niedermayer2013-05-191-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* configure: fix valgrind-massif to actually workMichael Niedermayer2013-05-191-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffserver: replace atoll() by strtoll()Michael Niedermayer2013-05-191-1/+1
| | | | | | this should make it easier to support ffserver with msvc Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-192-0/+363
|\ | | | | | | | | | | | | | | | | | | * qatar/master: Escape 130 FATE test Conflicts: tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Escape 130 FATE testKostya Shishkov2013-05-192-0/+363
| |
* | Merge commit '8e673efc6f5b7a095557664660305148f2788d30'Michael Niedermayer2013-05-194-6/+11
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '8e673efc6f5b7a095557664660305148f2788d30': prores: update FATE test to account for alpha plane present in the test sample configure: Add basic valgrind-massif support Conflicts: tests/fate/prores.mak tests/ref/fate/prores-alpha Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * prores: update FATE test to account for alpha plane present in the test sampleKostya Shishkov2013-05-192-3/+3
| |
| * configure: Add basic valgrind-massif supportLuca Barbato2013-05-182-3/+8
| | | | | | | | | | | | With the parameter --toolchain valgrind-massif, the configure script sets reasonable defaults that can be overridden as explained in the documentation.
* | Merge commit 'ed50673066956d6f2201a57c3254569f2ab08d9d'Michael Niedermayer2013-05-191-4/+5
|\| | | | | | | | | | | | | * commit 'ed50673066956d6f2201a57c3254569f2ab08d9d': wavpack: validate samples size parsed in wavpack_decode_block Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wavpack: validate samples size parsed in wavpack_decode_blockLuca Barbato2013-05-181-0/+3
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '8c34558131d846d2b10389564caadaa206372fd4'Michael Niedermayer2013-05-191-15/+15
|\| | | | | | | | | | | | | | | | | | | * commit '8c34558131d846d2b10389564caadaa206372fd4': wavpack: return meaningful errors Conflicts: libavcodec/wavpack.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wavpack: return meaningful errorsLuca Barbato2013-05-181-16/+16
| | | | | | | | And forward those that were already meaningful.
* | Merge commit '0f689a3d97a1d3053ca0e9516b296909a72ff31e'Michael Niedermayer2013-05-191-126/+159
|\| | | | | | | | | | | | | | | | | | | * commit '0f689a3d97a1d3053ca0e9516b296909a72ff31e': wavpack: K&R formatting cosmetics Conflicts: libavcodec/wavpack.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wavpack: K&R formatting cosmeticsLuca Barbato2013-05-181-126/+159
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | ftp: favor strtoll over atollHendrik Leppkes2013-05-191-1/+1
| | | | | | | | | | | | | | | | | | Both strtoll and atoll have different names on MSVC, and strtoll has a compatibility layer in place for this case. Fixes compilation on MSVC. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | proresdec2: Only try to decode alpha plane if four output planes were allocated.Carl Eugen Hoyos2013-05-191-1/+1
| | | | | | | | Fixes a crash with MPlayer.
* | FTP protocol supportLukasz Marek2013-05-187-0/+698
| | | | | | | | | | | | | | | | | | Implementation of ftp protocol. Fixes #1672 Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_deshake: check rxMichael Niedermayer2013-05-181-0/+5
| | | | | | | | | | | | | | | | | | | | Fixes crash on SSE2 Fixes Ticket2443 Note, its possible to restructure the code to avoid the 16pixel limitation, and such change is welcome! Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fmtconvert: int32_t input to int32_to_float_fmul_scalarChristophe Gisquet2013-05-1810-14/+14
| | | | | | | | | | | | | | | | | | | | | | It was previously declared as int. Does not change fate results for x86. Conflicts: libavcodec/ppc/fmtconvert_altivec.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | proresdec2: Support decoding transparency information.Kostya Shishkov2013-05-182-4/+101
| | | | | | | | Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
* | movenc: add video_track_timescale optionJean First2013-05-182-3/+9
| | | | | | | | | | Signed-off-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: set block_align for MACE 3:1 and MACE 6:1Piotr Bandurski2013-05-181-0/+2
| | | | | | | | | | | | fixes remuxing of audio track from mov to aifc Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec_align_dimensions2: add missing yuva formatsMichael Niedermayer2013-05-181-0/+12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sws/output: yuv2rgb_write() assert that alpha has the correct value in the ↵Michael Niedermayer2013-05-181-0/+6
| | | | | | | | | | | | tables Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/filters: apply minor fixes to owdenoise documentationStefano Sabatini2013-05-181-6/+6
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-185-185/+228
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Escape 130 (RPL) decoder Conflicts: libavcodec/Makefile libavcodec/allcodecs.c libavcodec/codec_desc.c libavcodec/escape130.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Escape 130 (RPL) decoderEli Friedman2013-05-189-3/+369
| | | | | | | | | | | | | | | | Some fixes provided by Paul B Mahol <onemda@gmail.com> and Michael Niedermayer <michaelni@gmx.at> and me. Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
* | Merge commit 'cebdedca57d95834a8f8098c7b6a322a1163e26b'Michael Niedermayer2013-05-182-11/+108
|\| | | | | | | | | | | | | | | * commit 'cebdedca57d95834a8f8098c7b6a322a1163e26b': prores: decode alpha plane when it's present avfilter: check a malloc in avfilter_link(). Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * prores: decode alpha plane when it's presentKostya Shishkov2013-05-181-9/+103
| |
| * avfilter: check a malloc in avfilter_link().Anton Khirnov2013-05-171-2/+5
| | | | | | | | Additionally change sizeof(type) into sizeof(var)
* | Merge commit 'bf5b5d2b1561535cc013c12ab8033228bb0d0081'Michael Niedermayer2013-05-181-12/+13
|\| | | | | | | | | | | | | | | | | | | * commit 'bf5b5d2b1561535cc013c12ab8033228bb0d0081': avfilter.c: cosmetics, reformat Conflicts: libavfilter/avfilter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avfilter.c: cosmetics, reformatAnton Khirnov2013-05-171-11/+13
| |
* | Merge commit 'd79bd6040599ef017dc45d5997fcc959ab1f71f6'Michael Niedermayer2013-05-181-23/+21
|\| | | | | | | | | | | | | | | | | | | * commit 'd79bd6040599ef017dc45d5997fcc959ab1f71f6': lavfi: factorize freeing a link Conflicts: libavfilter/avfilter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: factorize freeing a linkAnton Khirnov2013-05-171-23/+21
| |
* | Merge commit '1dd35611433c224e2231ed7ae26b5b560863a3cb'Michael Niedermayer2013-05-181-6/+8
|\| | | | | | | | | | | | | * commit '1dd35611433c224e2231ed7ae26b5b560863a3cb': vf_format: do not use the AVFilterFormats internals. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_format: do not use the AVFilterFormats internals.Anton Khirnov2013-05-171-6/+8
| | | | | | | | Use the formats.h API instead.
* | doc/fate: update server host key fingerprintsMichael Niedermayer2013-05-181-1/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c5ab6088ad7b0dac461fb6757b038f5260e638e5'Michael Niedermayer2013-05-181-1/+1
|\| | | | | | | | | | | | | * commit 'c5ab6088ad7b0dac461fb6757b038f5260e638e5': af_aformat: cosmetics, fix indentation Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * af_aformat: cosmetics, fix indentationAnton Khirnov2013-05-171-1/+1
| |
* | Merge commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0'Michael Niedermayer2013-05-186-29/+29
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0': lavfi: rename AVFilterFormats.format_count to nb_formats Conflicts: libavfilter/avfiltergraph.c libavfilter/filtfmts.c libavfilter/formats.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: rename AVFilterFormats.format_count to nb_formatsAnton Khirnov2013-05-175-21/+21
| | | | | | | | This is more consistent with naming in the rest of Libav.
* | Merge commit 'e27f4b7cbf8a3fde313cfe4b3a1880bf5031e9ae'Michael Niedermayer2013-05-181-1/+1
|\| | | | | | | | | | | | | * commit 'e27f4b7cbf8a3fde313cfe4b3a1880bf5031e9ae': doxy: don't sort struct members alphabetically Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxy: don't sort struct members alphabeticallyAnton Khirnov2013-05-171-1/+1
| | | | | | | | The declaration order is more meanigful in most cases.
* | Merge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca'Michael Niedermayer2013-05-182-1/+8
|\| | | | | | | | | | | | | | | * commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca': lavr doxy: add version.h to the lavr group lavc doxy: add avcodec.h to the libavcodec group. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr doxy: add version.h to the lavr groupAnton Khirnov2013-05-171-0/+6
| |
| * lavc doxy: add avcodec.h to the libavcodec group.Anton Khirnov2013-05-171-1/+2
| |