summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | Merge commit '9cacdabd1c8cd257a942d8289349c37d992989b7'Michael Niedermayer2013-05-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '9cacdabd1c8cd257a942d8289349c37d992989b7': jpegls: cosmetics: Drop some unnecessary parentheses mpegvideo: Remove commented-out PARANOID debug cruft Conflicts: libavcodec/jpegls.c libavcodec/mpegvideo.c libavcodec/x86/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpegls: cosmetics: Drop some unnecessary parenthesesDiego Biurrun2013-05-15
| |
| * mpegvideo: Remove commented-out PARANOID debug cruftDiego Biurrun2013-05-15
| |
* | Merge commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d'Michael Niedermayer2013-05-16
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d': Remove commented-out #includes h263dec: Remove broken and disabled debug cruft vc1: Reindent INIT_LUT(), align backslashes Conflicts: libavcodec/vc1.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove commented-out #includesDiego Biurrun2013-05-15
| |
| * h263dec: Remove broken and disabled debug cruftDiego Biurrun2013-05-15
| |
| * vc1: Reindent INIT_LUT(), align backslashesMartin Storsjö2013-05-15
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavfi/mp: remove mp=ow wrapper.Clément Bœsch2013-05-16
| | | | | | | | Filter ported natively as owdenoise.
* | lavfi: port wavelet denoiser filter from libmpcodecs.Clément Bœsch2013-05-16
| |
* | lavu/hash: Fix CRC32 calculationJames Almer2013-05-15
| | | | | | | | | | | | | | | | Initialize it with UINT32_MAX and xor the result with UINT32_MAX as well. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavu/hash: Fix adler32 calculationJames Almer2013-05-15
| | | | | | | | | | | | | | Adler must be initialized with a non zero value. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2013-05-15
|\ \ | | | | | | | | | | | | | | | | | | * cigaes/master: lavf/concat: reject empty scripts. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavf/concat: reject empty scripts.Nicolas George2013-05-15
| | | | | | | | | | | | Fix trac ticket #2566.
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-15
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: configure: Use linker hardening flags on mingw vc1: Make INIT_LUT() self contained vc1: Simplify code by using INIT_LUT() vc1: Move INIT_LUT() further up to allow using it in more places vc1dec: Remove some now unused variables vc1dec: Do not allow field_mode to change after the first header vc1, mss2: Check for any negative return value from ff_vc1_parse_frame_header vc1dec: Fix current ptr selection in vc1_mc_4mv_chroma() vc1dec: Factorize picture pointer selection in vc1_mc_4mv_chroma() vc1dec: Factorize picture pointer selection code vc1dec: Factorize srcU/V offseting vc1dec: Fix tff == 0 handling in init_block_index() vc1dec: Update destination pointers in context for fields Conflicts: libavcodec/vc1.c libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Use linker hardening flags on mingwAlex Smith2013-05-15
| | | | | | | | | | | | | | | | | | | | This makes it consistent with the msvc builds which automatically set the DEP and ASLR flags by default. There really is no good reason why they shouldn't be set. The fact that binutils does not set them on by default boggles the mind. Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1: Make INIT_LUT() self containedMichael Niedermayer2013-05-15
| | | | | | | | | | | | | | Move the local variables it uses into the macro, enclosing them in a do {} while (0) scope. Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1: Simplify code by using INIT_LUT()Michael Niedermayer2013-05-15
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1: Move INIT_LUT() further up to allow using it in more placesMichael Niedermayer2013-05-15
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1dec: Remove some now unused variablesMartin Storsjö2013-05-15
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1dec: Do not allow field_mode to change after the first headerMichael Niedermayer2013-05-15
| | | | | | | | | | | | | | | | This fixes out of array accesses. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1, mss2: Check for any negative return value from ff_vc1_parse_frame_headerMartin Storsjö2013-05-15
| | | | | | | | | | | | | | | | This is required if we return other error codes than explicitly -1, which so far has been the only other possible return value besides 0. Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1dec: Fix current ptr selection in vc1_mc_4mv_chroma()Michael Niedermayer2013-05-15
| | | | | | | | | | | | No sample tried shows a difference. Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1dec: Factorize picture pointer selection in vc1_mc_4mv_chroma()Michael Niedermayer2013-05-15
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1dec: Factorize picture pointer selection codeMichael Niedermayer2013-05-15
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1dec: Factorize srcU/V offsetingMichael Niedermayer2013-05-15
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1dec: Fix tff == 0 handling in init_block_index()Michael Niedermayer2013-05-15
| | | | | | | | | | | | This fixes several files from VLC ticket 5887. Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1dec: Update destination pointers in context for fieldsMichael Niedermayer2013-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces a large number of checks for the second field by fixing the pointers when they are setup. This should also fix I/BI field pictures. Changes checksums for vc1_sa10143, the file becomes slightly closer to what the reference decoder outputs. Based on "vc1dec: the second field is written wrong to the picture" by Sebastian Sandberg <sebastiand.sandberg@gmail.com>. Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavfi/histogram: logarithmic mode for levelsPaul B Mahol2013-05-15
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | wv: make probing more robustPaul B Mahol2013-05-15
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | dpxenc: dont shift into the sign bit.Michael Niedermayer2013-05-15
| | | | | | | | | | | | Fixes IOC warnings Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | murmur3: fix memleakMichael Niedermayer2013-05-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-05-15
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Reduce probing score for flic animation files. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Reduce probing score for flic animation files.Carl Eugen Hoyos2013-05-15
| | | | | | | | | | | | Fixes ticket #2567.
* | | replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_*Michael Niedermayer2013-05-15
|/ / | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_* Conflicts: doc/APIchanges libavcodec/avpicture.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/imgconvert.c libavcodec/tiffenc.c libavfilter/vf_pixdesctest.c libavfilter/vf_scale.c libavutil/imgutils.c libavutil/pixdesc.c libavutil/version.h libswscale/swscale_internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*Anton Khirnov2013-05-15
| |
* | Merge commit '7c57a582a03fb473091a88737ab92b9f2a5bb87a'Michael Niedermayer2013-05-15
|\| | | | | | | | | | | | | * commit '7c57a582a03fb473091a88737ab92b9f2a5bb87a': jpeg2000dec: don't use deprecated PIX_FMT values Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpeg2000dec: don't use deprecated PIX_FMT valuesAnton Khirnov2013-05-15
| |
* | Merge commit 'ffba2053edfc177d217bf4a95edf51cd0fc40753'Michael Niedermayer2013-05-15
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'ffba2053edfc177d217bf4a95edf51cd0fc40753': lavfi: fix compatibility code for old vf_scale options syntax Conflicts: libavfilter/avfilter.c No change as the buggy code does not exist in FFmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: fix compatibility code for old vf_scale options syntaxAnton Khirnov2013-05-15
| | | | | | | | | | Currently it would incorrectly trigger on a string that contains a '=' but does not contain a ':', e.g. flags=<flags>.
* | Merge commit '096696ef0dd391d9430376d1444c1a3cde9171fd'Michael Niedermayer2013-05-15
|\| | | | | | | | | | | | | | | * commit '096696ef0dd391d9430376d1444c1a3cde9171fd': avfiltergraph: simplify inserting conversion filters. Clarify output of av_get_bits_per_pixel Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avfiltergraph: simplify inserting conversion filters.Anton Khirnov2013-05-15
| | | | | | | | | | There is now no need to explicitly pass 0:0 as width/height to scale, those are the defaults.
| * Clarify output of av_get_bits_per_pixelKieran Kunhya2013-05-15
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '7cbc4cb4424430586ce2d5c0dba81174c6d1db01'Michael Niedermayer2013-05-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '7cbc4cb4424430586ce2d5c0dba81174c6d1db01': fate: update the mmf reference mmf: Write metadata into an Optional Data chunk jpeg2000dec: Use correct printf length modifier for pointer differences Conflicts: libavformat/mmf.c tests/ref/lavf/mmf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: update the mmf referenceLuca Barbato2013-05-14
| | | | | | | | Using Optional Data chunk introduced changes the hash.
| * mmf: Write metadata into an Optional Data chunkYoshihisa Uchida2013-05-14
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * jpeg2000dec: Use correct printf length modifier for pointer differencesDiego Biurrun2013-05-14
| | | | | | | | | | Also eliminate an unnecessary cast. Fixes the following warning: jpeg2000dec.c:1200:20: warning: format ‘%lX’ expects argument of type ‘long unsigned int’, but argument 5 has type ‘long long unsigned int’
* | Merge commit '5d9d8461fbb87046a7ca220d3676a045bd7ab46e'Michael Niedermayer2013-05-15
|\| | | | | | | | | | | | | | | | | | | * commit '5d9d8461fbb87046a7ca220d3676a045bd7ab46e': vc1dec: Don't apply the loop filter on fields Conflicts: tests/ref/fate/vc1_sa10143 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1dec: Don't apply the loop filter on fieldsMartin Storsjö2013-05-14
| | | | | | | | | | | | | | | | Fixes read of uninitialized memory. Based on a patch by Michael Niedermayer. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'fe06795d783785a76c6cbcaa2cd3012e6deb5fa5'Michael Niedermayer2013-05-15
|\| | | | | | | | | | | | | | | | | | | * commit 'fe06795d783785a76c6cbcaa2cd3012e6deb5fa5': vc1: implement frame interlaced b-frame header parsing Conflicts: libavcodec/vc1.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-17 11:47:29 +0000