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

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-02-12Merge commit '62a43d30cc3b9b2460f2c926beb522df32493625'Michael Niedermayer
* commit '62a43d30cc3b9b2460f2c926beb522df32493625': crc: Move static data table from header to .c file avcodec/rectangle: Remove nonsense assert Conflicts: libavcodec/rectangle.h libavutil/crc_data.h The assert is not removed as the assert ensures clear and easy to debug failures instead of undefined behavior in case of misalignment. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-12Merge commit '375ef6528c9dd2db7f9881e232cb0ec3aa16970d'Michael Niedermayer
* commit '375ef6528c9dd2db7f9881e232cb0ec3aa16970d': libfdk-aacenc: Actually check for upper bounds of cutoff arm: Fall back to runtime cpu feature detection via /proc/cpuinfo Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-12Add add_pixels4/8() to h264dsp, and remove add_pixels4 from dsputil.Ronald S. Bultje
These functions are mostly H264-specific (the only other user I can spot is bink), and this allows us to special-case some functionality for H264. Also remove the 16-bit-coeff with >8bpp versions (unused) and merge the duplicate 32-bit-coeff for >8bpp (identical). Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-12sanm: Use the correct height variable in the decoded_size checksMichael Niedermayer
Fixes integer overflow and out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-12sanm: init sizes with the full frame sizeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-12sanm: reset frame sizes on buffer destructionMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-12sanm: add forgotten check for decoded_size in old_codec37()Michael Niedermayer
Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-12ffmpeg: fix streamcopy of lsf mp3.Michael Niedermayer
Fixes streamcopy of bear_mpeg4_mp3.avi Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-12doc/filters: rework idet filter descriptionStefano Sabatini
2013-02-12doc/filters: apply minor fixes to il filter docsStefano Sabatini
2013-02-12doc/filters: fix position of il filter docsStefano Sabatini
2013-02-12Use simple nop codes for <= sse (rather than <= mmx).Ronald S. Bultje
The "CPU: CentaurHauls family 6 model 9 stepping 8" family of CPUs (flags: fpu vme de pse tsc msr cx8 sep mtrr pge mov pat mmx fxsr sse up rng rng_en ace ace_en) SIGILLs on long nop codes. Change-Id: I7e7c52a2191006df30a9aadbc40d481a1db89106
2013-02-12h264chroma: remove duplicate 9/10 bit functions.Ronald S. Bultje
Also use the resulting 16bpp functions for anything >8 and <=16, not just 9 and 10. This fixes 12 and 14bpp H264 support. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-11ffv1enc: better heuristic to calculate initial statesMichael Niedermayer
Slightly improves compression of 2pass files Tested-by: "Peter B." <pb@das-werkstatt.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-11crc: Move static data table from header to .c fileDiego Biurrun
Having static data tables in header files is a potential source of trouble.
2013-02-11avcodec/rectangle: Remove nonsense assertDiego Biurrun
2013-02-11libfdk-aacenc: Actually check for upper bounds of cutoffDerek Buitenhuis
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-02-11libfdk-aacenc: Actually check for upper bounds of cutoffDerek Buitenhuis
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-02-11arm: Fall back to runtime cpu feature detection via /proc/cpuinfoMartin Storsjö
On recent android versions, /proc/self/auxw is unreadable (unless the process is running running under the shell uid or in debuggable mode, which makes it hard to notice). See http://b.android.com/43055 and https://android-review.googlesource.com/51271 for more information about the issue. This makes sure e.g. neon optimizations are enabled at runtime in android apps even when built in release mode, if configured to use the runtime detection. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
2013-02-11lavfi/amerge: make description consistent with documentationPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-11Print mxf Universal Label if the user requested verbose logging.Carl Eugen Hoyos
Fixes ticket #2198
2013-02-11Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: sparc: dsputil_vis: Fix silly variable name search and replace typo Conflicts: libavcodec/sparc/dsputil_vis.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-11evrcdec: fix wrong conditionPaul B Mahol
Fixes CID980005 and CID980004. Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-11get_bits: return pointer to buffer that is the result of the alignment.Ronald S. Bultje
This allows more transparent mixing of get_bits and whole-byte access without having to touch get_bits internals. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-11bit_depth_template: don't depend on dsputil.h.Ronald S. Bultje
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-11Move ff_emulated_edge_mc prototypes to videodsp.Ronald S. Bultje
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-11h264 intra pred: add missing includes.Ronald S. Bultje
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-11mlpdec: check ch_assign more completelyMichael Niedermayer
Fixes CID970924 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-11sparc: dsputil_vis: Fix silly variable name search and replace typoDiego Biurrun
2013-02-11lavfi/il: filter out hwaccels formats from the list of supported formatsStefano Sabatini
2013-02-11lavf/matroskaenc: provide more feedback in case of unsupported codecStefano Sabatini
Also return meaningful error code.
2013-02-10lavd/v4l2: fix error logic when enumerating standardsStefano Sabatini
Set ret to 0 before enumerating standards in v4l2_set_parameters(), avoid use of uninitialized variable. Regression introduced in 60950adc18fe145a235211e75da68ab07123fcaa.
2013-02-10tiff: dont leave geotag_count in an invalid state on errors.Michael Niedermayer
Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10tiff: check for failure in search_keyval()Michael Niedermayer
Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10pictordec: fix cga palette index limitMichael Niedermayer
Fixes out of array read Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10Fix division by 0 due to audio frame sizeMichael Niedermayer
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10dpx: include offset in the total_size calculationMichael Niedermayer
Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10dpx: Fix rounding in 10bit total_size calculationMichael Niedermayer
This could have caused out of array reads Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10pcx: Add missing padding to scanline bufferMichael Niedermayer
Fixes out of array read Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10pcx: use init_get_bits8()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10lavd/v4l2: implement consistent error handlingStefano Sabatini
In particular, avoid use of non-thread-safe strerror(), and store errno before calling av_log().
2013-02-10tests: add fate-lavfi-il testStefano Sabatini
2013-02-10pcx: fix rounding in bytes_per_scanline checkMichael Niedermayer
Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10Support more atrac3-in-mkv samples.Carl Eugen Hoyos
The mkv demuxer sometimes finds 12 bytes of realmedia extradata after the matroska real audio properties.
2013-02-10Revert "Merge commit 'db0a943266be29ff0596872ebb418dfed75d00de'"Michael Niedermayer
This reverts commit d80820655362645ae1c65d457287d7d12c04a44f, reversing changes made to 30085bd43e35acf931429dc445db5bc1869be022. This is not needed Requested-by: Marton Balint
2013-02-10Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: sws: disable yuv2rgb warning for planar rgb. Conflicts: libswscale/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10Merge commit '7b41c24c5fa221b55a9302efaf1a9eeb38b12551'Michael Niedermayer
* commit '7b41c24c5fa221b55a9302efaf1a9eeb38b12551': sws: dont enable chrSrcHSubSample for planar RGB Conflicts: libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10lavfi/il: move query_formats() definition upStefano Sabatini
Respect order of call during the filter lifecycle, improve readability.
2013-02-10lavfi/il: simplify/generalize linesize computationStefano Sabatini
Rely on generic utilities for computing each plane linesize. In particular, add support to NV12/21 formats and avoid use of PIX_FMT_PLANAR pixdesc flag, whose semantics is questionable. It also fixes various crashes.
2013-02-10Merge commit 'e58013dd8f00e17dd98ba64e41c72f1d152f6608'Michael Niedermayer
* commit 'e58013dd8f00e17dd98ba64e41c72f1d152f6608': sws: use planarRgbToRgbWrapper only for 8bit per component Conflicts: libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at>