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-05-05Merge commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70'Michael Niedermayer
* commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70': swscale: Add av_cold attributes to init functions missing them Conflicts: libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05Merge commit '1fda184a85178cfd7b98d9e308d18e1ded76a511'Michael Niedermayer
* commit '1fda184a85178cfd7b98d9e308d18e1ded76a511': avutil: Add av_cold attributes to init functions missing them Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05Merge commit '20c86571ccc71412781d4a4813e4693e0c42aec6'Michael Niedermayer
* commit '20c86571ccc71412781d4a4813e4693e0c42aec6': lavfi: let gcc realign the stack on public graph driving functions Conflicts: libavfilter/buffersink.c libavfilter/buffersrc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05Merge commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f'Michael Niedermayer
* commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f': sctp: Add a note on why sctp_recvmsg and sctp_sendmsg have ff_-prefixes avs: Increase magic value score above file extension score Conflicts: libavformat/avs.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'Michael Niedermayer
* commit 'e0f8be6413b6a8d334d6052e610af32935c310af': avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate Conflicts: libavformat/ac3dec.c libavformat/avformat.h libavformat/avs.c libavformat/m4vdec.c libavformat/mov.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegvideodec.c libavformat/psxstr.c libavformat/pva.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05Merge commit '4d7ed3e73541983459a7913c2034eba69ebc113d'Michael Niedermayer
* commit '4d7ed3e73541983459a7913c2034eba69ebc113d': build: output-example: Add avutil to ELIBS in link command Conflicts: libavformat/Makefile No change as our example build code doesnt have this bug Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05Merge commit 'e445647b4fdf481b13b2743b303d84de4f43bedd'Michael Niedermayer
* commit 'e445647b4fdf481b13b2743b303d84de4f43bedd': avresample: Add av_cold attributes to init functions missing them Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05Merge commit '093804a93cc5da3f95f98265a5df116912443cec'Michael Niedermayer
* commit '093804a93cc5da3f95f98265a5df116912443cec': avfilter: Add av_cold attributes to init/uninit functions Conflicts: libavfilter/af_ashowinfo.c libavfilter/af_volume.c libavfilter/src_movie.c libavfilter/vf_lut.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05Merge commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487'Michael Niedermayer
* commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487': avcodec: Add av_cold attributes to init functions missing them Conflicts: libavcodec/aacpsy.c libavcodec/atrac3.c libavcodec/dvdsubdec.c libavcodec/ffv1.c libavcodec/ffv1enc.c libavcodec/h261enc.c libavcodec/h264_parser.c libavcodec/h264dsp.c libavcodec/h264pred.c libavcodec/libschroedingerenc.c libavcodec/libxvid_rc.c libavcodec/mpeg12.c libavcodec/mpeg12enc.c libavcodec/proresdsp.c libavcodec/rangecoder.c libavcodec/videodsp.c libavcodec/x86/proresdsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05Merge commit '72e228b274a98af1aba9588415d0cd87fde44663'Michael Niedermayer
* commit '72e228b274a98af1aba9588415d0cd87fde44663': nut: K&R formatting cosmetics Conflicts: libavformat/nut.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05configure: fix valgrind-memcheck argumentsMichael Niedermayer
They now match the --valgrind arguments Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05Merge commit 'b1ee8eec849f17fce2f411a297de9cbf2edaeb3a'Michael Niedermayer
* commit 'b1ee8eec849f17fce2f411a297de9cbf2edaeb3a': configure: Add basic valgrind-memcheck support Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05Merge commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07'Michael Niedermayer
* commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07': build: normalize coverage.info Conflicts: tests/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05Merge commit '768e44d044bc32de1e58c198a3708d186af7e966'Michael Niedermayer
* commit '768e44d044bc32de1e58c198a3708d186af7e966': build: tune down the output of lcov/gcov Conflicts: tests/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05Detect and skip mj2-style jp2c header.Reimar Döffinger
This this fixes one of the issues with http://blogs.bu.edu/mhirsch/files/2012/08/Rotate180CCW-checkerboard.mj2_.zip and at least allows to demux the file properly instead of failing during probing. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-05-05Avoid incorrect deprecated pixel format warning.Reimar Döffinger
Should only be printed if a "JPEG" format was used, not for e.g. XYZ. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-05-05AAC encoder: Fix rate control on twoloop.Claudio Freire
Fixes a case where multichannel bitrate isn't accurately targetted by psy model alone, never achieving the target bitrate. Now fixed. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05AAC encoder: Fixed a rounding bug in psy's channel bitrate computation.Claudio Freire
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05src_movie: fix scanf stringMichael Niedermayer
Fixes out of array accesses Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05xbmdec: fix off by one error in scanf()Michael Niedermayer
Fixes out of array access Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05swscale: Add av_cold attributes to init functions missing themDiego Biurrun
2013-05-05avutil: Add av_cold attributes to init functions missing themDiego Biurrun
2013-05-05lavfi: let gcc realign the stack on public graph driving functionsHendrik Leppkes
The functions which actually drive the filter graph by pushing frames through it need to ensure an aligned stack for SIMD functions. This fixes a crash in YADIF filter when using a mingw build in a MSVC application. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-05sctp: Add a note on why sctp_recvmsg and sctp_sendmsg have ff_-prefixesDiego Biurrun
2013-05-04avs: Increase magic value score above file extension scoreDiego Biurrun
This should fix misdetection of AVS files as AviSynth scripts when AviSynth support is enabled (Bugzilla #357).
2013-05-04avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriateDiego Biurrun
2013-05-04build: output-example: Add avutil to ELIBS in link commandDiego Biurrun
output-example links against swscale, which depends on avutil. In standard configurations, by pure good luck, the libs before swscale pull in all of swscale's dependencies and linking succeeds. However, in some configurations like --disable-asm this is not the case and linking fails. Hardcode the dependency to avoid a more general Makefile refactoring.
2013-05-04avresample: Add av_cold attributes to init functions missing themDiego Biurrun
2013-05-04avfilter: Add av_cold attributes to init/uninit functionsDiego Biurrun
2013-05-04avcodec: Add av_cold attributes to init functions missing themDiego Biurrun
2013-05-04h264: Always decode MMCOs into temprary arrayMichael Niedermayer
When decoding succeeded the array is copied into the permanent one. This prevents inconsistencies Fixes assertion failure Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04nut: K&R formatting cosmeticsLuca Barbato
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-05-04Merge remote-tracking branch 'cigaes/master'Michael Niedermayer
* cigaes/master: lavf/matroskaenc: return an error for unsupported types. lavf/concatdec: remove invalid check for AVSEEK_FLAG_BACKWARD. lavf: filter out AVSEEK_FLAG_BACKWARD in new API. lavf: call the new seek API from the old. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04wmaprodec: Fix null pointer dereference in decode_frame()Michael Niedermayer
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04dfa: Put our pointer check back.Michael Niedermayer
The reimplementation by Libav does not prevent out of array writes, even though it looks like it does at a quick glance. No FFmpeg releases are affected by this See: d1c95d2ce39560e251fdb14f4af91b04fd7b845c 3623589edc7b1257bb45aa9e52c9631e133f22b6 740ebe468c0567cac03ef7e6b4b9fd0253b97da2 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04lavf/matroskaenc: return an error for unsupported types.Nicolas George
2013-05-04lavf/concatdec: remove invalid check for AVSEEK_FLAG_BACKWARD.Nicolas George
2013-05-04lavf: filter out AVSEEK_FLAG_BACKWARD in new API.Nicolas George
Also document that it has no effect.
2013-05-04lavf: call the new seek API from the old.Nicolas George
If the demuxer implements read_seek2() and not read_seek(), call avformat_seek_file() from av_seek_frame(). Allow to properly seek in formats that only implement the new API from applications that use the old one. Tested with mplayer and a concat script.
2013-05-04aacdec: free frame buffer if no audio was decodedHendrik Leppkes
If no decoding error was detected, but still no audio was decoded, the frame needs to be free'ed, or it will leak. Fixes part of ticket #2095 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04configure: Add basic valgrind-memcheck supportReinhard Tartler
With the parameter --valgrind-memcheck, the configure script sets reasonable defaults that can be overridden as explained in the documentation. The idea of using set_defaults is from Luca Barbato.
2013-05-04Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: wav: return meaningful errors Conflicts: libavformat/wavdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'Michael Niedermayer
* commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7': silly typo fixes Conflicts: doc/protocols.texi libavcodec/aacpsy.c libavformat/utils.c tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04Merge commit '4a7af92cc80ced8498626401ed21f25ffe6740c8'Michael Niedermayer
* commit '4a7af92cc80ced8498626401ed21f25ffe6740c8': sbrdsp: Unroll and use integer operations sbrdsp: Unroll sbr_autocorrelate_c x86: sbrdsp: Implement SSE2 qmf_deint_bfly Conflicts: libavcodec/sbrdsp.c libavcodec/x86/sbrdsp.asm libavcodec/x86/sbrdsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04build: normalize coverage.infoReinhard Tartler
Without this, lcov sometimes misses to normalize paths that contain "/./". Also, ignore uninteresting hits in system headers.
2013-05-04build: tune down the output of lcov/gcovReinhard Tartler
In the default settings, both tools produce a lot of unhelpful noise.
2013-05-04evrcdec: fix sign errorMichael Niedermayer
The specification wants round(abs(x))) * sign(x) which is equivakent to round(x) Fixes out of array access Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04snow: Fix off by 1 error in reference picture managementMichael Niedermayer
Fixes out of array accesses No release is affected by this bug Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04eamad: Check against minimum supported dimensionsMichael Niedermayer
Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03doc/filters: document asetpts in single placePaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 04:59:07 +0300