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
2014-07-05avfilter/haldclut: fix R/B swap in CLUT loadingClément Bœsch
Fixes Ticket #3751.
2014-07-05Merge commit '009331303a6462d07cbe94aef9c446f1a1695519'Michael Niedermayer
* commit '009331303a6462d07cbe94aef9c446f1a1695519': x86: huffyuvdsp: Move inline assembly to init file Conflicts: libavcodec/x86/Makefile libavcodec/x86/huffyuvdsp.h libavcodec/x86/huffyuvdsp_init.c libavcodec/x86/huffyuvdsp_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-05x86: huffyuvdsp: Move inline assembly to init fileDiego Biurrun
This avoids a link failure with MMX disabled as now code and initialization are compiled under the same condition.
2014-07-05Fix standalone compilation of the amv encoder.Carl Eugen Hoyos
2014-07-05doc/protocols: document unit of timeouts for ftp and httpLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2014-07-05tools/ffeval: print computed value even in case of errorStefano Sabatini
This is useful for debugging purposes.
2014-07-05lavfi/drawtext: do not allocate FT_Glyph, but keep it in the Glyph structureStefano Sabatini
Slightly simplify.
2014-07-05Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer
* cehoyos/master: Use os/2 palette even if it contains less than 256 entries. Assume that old bmps do not contain transparency information. Do not detect jp2 images as mov files. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-05Merge commit 'e0bfe34ea8ccf333ec5b17961fd58eb575e74f8b'Michael Niedermayer
* commit 'e0bfe34ea8ccf333ec5b17961fd58eb575e74f8b': libfdk-aacdec: Reduce the default decoder delay by one frame Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-05Use os/2 palette even if it contains less than 256 entries.Carl Eugen Hoyos
Fixes 11Bios13.bmp.
2014-07-05Assume that old bmps do not contain transparency information.Carl Eugen Hoyos
Fixes MK50TEMP.BMP that has its RGB channel bit masks on the actual image.
2014-07-05Do not detect jp2 images as mov files.Carl Eugen Hoyos
2014-07-05libfdk-aacdec: Reduce the default decoder delay by one frameOmer Osman
The default error concealment method if none is set via aacDecoder_SetParam(AAC_CONCEAL_METHOD) is set in CConcealment_InitCommonData within the fdk-aac library and is set to Energy Interpolation. This method requires one frame delay to the output. To reduce the default decoder output delay and avoid missing the last frame in file based decoding, use Noise Substitution as the default concealment method. Signed-off-by: Omer Osman <omer.osman@iis.fraunhofer.de> Signed-off-by: Martin Storsjö <martin@martin.st>
2014-07-05Doxyfile: imitate gcc for better libavutil/attributes.h documentationTimothy Gu
Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-05downmix_info: clarify doxygenTimothy Gu
Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-05channel_layout: doxy: merge functions with macrosTimothy Gu
Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04Doxyfile: enable browser-based search engineTimothy Gu
Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04avutil: fix version macros doxygen moduleTimothy Gu
Without this patch, "Library Version Macros" module is not visible on libavutil homepage in `make apidoc`. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04lavf/libssh: call ssh_userauth_none before ssh_userauth_listLukasz Marek
According to doc, ssh_userauth_none must be called before ssh_userauth_list. It solves login issue for new versions of libssh. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04avcodec/mlp_parser: check ff_combine_frame() return codeMichael Niedermayer
Fixes CID602338 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04avformat/img2dec: remove functions from image pipe which are unneeded for ↵Michael Niedermayer
image pipes Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04avcodec/bmp: fix integer overflow in checking header sizesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04avformat/img2dec: improve bmp probeMichael Niedermayer
fix probetest failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04avformat/img2dec: increase probe buffer to 2kMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04configure: update dependencies for vf_sppMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04avformat/img2dec: set AVProbeData size correctly on corner cases of tiny filesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04avformat/img2dec: avoid seekback on probeingMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04avformat/img2dec: allocate and clear padding area for probe correctlyMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04Merge remote-tracking branch 'lukaszmluki/master'Michael Niedermayer
* lukaszmluki/master: lavf/ftp: always treat all response codes >= 500 as error lavf/ftp: explicitly enable UTF-8 lavf/ftp: make response parsing more RFC compliant Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04x86/swr: use lavu helper macros to check CPU extensionsJames Almer
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04Autodetect JPEG2000 imagess.Carl Eugen Hoyos
Autodetection of jp2 files does not work yet, the files are detected as mov.
2014-07-04x86/swr: split audioconvert and rematrix DSP into separate filesJames Almer
Also rename resample_x86_dsp.c to resample_init.c Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04swr: initialize only the necessary resample dsp functionsJames Almer
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04lavf/ftp: always treat all response codes >= 500 as errorLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-07-04lavf/ftp: explicitly enable UTF-8Lukasz Marek
Most FTP servers enable UTF-8 by default, but it is not required by the standard. Enabling it manually makes ffmpeg implementation more consistent when server doesn't enable it by default. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-07-04lavf/ftp: make response parsing more RFC compliantLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-07-04Merge commit '391ecc961ced2bde7aecb3053ac35191f838fae8'Michael Niedermayer
* commit '391ecc961ced2bde7aecb3053ac35191f838fae8': x86: mpegvideoenc: Change SIMD optimization name suffixes to lowercase Conflicts: libavcodec/x86/mpegvideoenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04Merge commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced'Michael Niedermayer
* commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced': webpdec: Fix decoding of the huffman group indices. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04Merge commit '9279826008b80daad7446950a821f32033ccd33f'Michael Niedermayer
* commit '9279826008b80daad7446950a821f32033ccd33f': id3v2enc: use a case-insensitive comparison for APIC picture type Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04avcodec/dvdsubdec: fix alpha in debuging codeOliver Fromme
improve the debugging function for saving subtitles to PPM files: Actually use the alpha channel. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04avcodec/dvdsubdec: Fix off-by-one errorOliver Fromme
Fix an off-by-one error that causes the height of decoded subtitles to be too small, thus cutting off the lowest row of pixels. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04x86: mpegvideoenc: Change SIMD optimization name suffixes to lowercaseDiego Biurrun
2014-07-03Merge commit '0955e57ad07640574fc20ce0bea3c0b83982ada1'Michael Niedermayer
* commit '0955e57ad07640574fc20ce0bea3c0b83982ada1': daud: split muxer and demuxer Conflicts: libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-03webpdec: Fix decoding of the huffman group indices.Justin Ruggles
Per the specification, "The red and green components of a pixel define the meta Huffman code used in a particular block of the ARGB image."
2014-07-03Merge commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0'Michael Niedermayer
* commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0': ismindex: Add an option for outputting files elsewhere than in the current directory Conflicts: tools/ismindex.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-03id3v2enc: use a case-insensitive comparison for APIC picture typeAnton Khirnov
2014-07-03Merge commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e'Michael Niedermayer
* commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e': ismindex: Allow adding a path prefix to the generated .ism file Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-03daud: split muxer and demuxerNidhi Makhijani
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-07-03ismindex: Add an option for outputting files elsewhere than in the current ↵Martin Storsjö
directory Signed-off-by: Martin Storsjö <martin@martin.st>
2014-07-03ismindex: Allow adding a path prefix to the generated .ism fileMartin Storsjö
This allows storing the .ismv/.isma/.ismc files separately from the .ism file on a server, without having to manually edit the .ism file after generating it with the ismindex tool. Signed-off-by: Martin Storsjö <martin@martin.st>