aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* x86: sbrdsp: force PIC addressing for Win64Christophe Gisquet2013-05-082-13/+2
| | | | | | MSVC complains about the 32bits addressing, while mingw/gcc does not. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavfi/unsharp: use verbal form in help message optionsStefano Sabatini2013-05-081-12/+12
|
* lavu/mem: fix potential int overflow and crash in av_dynarray_add()Stefano Sabatini2013-05-082-2/+14
| | | | Also extend documentation accordingly.
* lavu/mem: extend documentation for av_dynarray_add()Stefano Sabatini2013-05-081-3/+14
| | | | | In particular, mention the fact that the amortized element addition cost is constant.
* avcodec/mpegvideo: Fix edge emu with lowresMichael Niedermayer2013-05-081-1/+1
| | | | | | | Fixes a few green artifacts at the top Fixes rest of Ticket 2535 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/mpegvideo: Fix block height for lowres 3 interlaced blocksMichael Niedermayer2013-05-081-3/+4
| | | | | | | Fixes green trash Fixes part of Ticket2535 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2013-05-072-4/+23
|\ | | | | | | | | | | | | | | | | * cigaes/master: lavfi: add comments to explain the negotiation loop. lavfi: fix filter format negotiation loop. ffmpeg: move a local variable definition later. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: add comments to explain the negotiation loop.Nicolas George2013-05-071-2/+19
| |
| * lavfi: fix filter format negotiation loop.Nicolas George2013-05-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | query_formats() returning EAGAIN is not considered a progress in the format negotiation. If the filter returns EAGAIN but did set some of its formats lists, it could be considered a partial success and counted as progress in the negotiation. Not counting it is not a problem because it currently only happens in the first round, where there will always be some progress on the other filters.
| * ffmpeg: move a local variable definition later.Nicolas George2013-05-071-1/+2
| | | | | | | | Fix a segfault when using the -map option without input files.
* | avformat/vqf: check number of channels before use.Michael Niedermayer2013-05-071-0/+5
| | | | | | | | | | | | | | Fixes division by zero Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sanm: Check dimensions before useMichael Niedermayer2013-05-071-0/+5
| | | | | | | | | | | | | | Fixes integer overflow and out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/cdgraphics: check buffer size before useMichael Niedermayer2013-05-071-1/+3
| | | | | | | | | | | | | | Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dxa: check vectors of 2x2 motion blocksMichael Niedermayer2013-05-071-0/+5
| | | | | | | | | | | | | | Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dxa: check vectors of 4x4 motion blocksMichael Niedermayer2013-05-071-0/+5
| | | | | | | | | | | | | | Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | shorten: allocate space for paddingMichael Niedermayer2013-05-071-1/+1
|/ | | | | | | Fixes array overread Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* gifdec: reset previous Graphic Control Extension disposal typeMichael Niedermayer2013-05-071-0/+1
| | | | | | | This fixes out of array accesses. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavfi/overlay: reindent fix.Clément Bœsch2013-05-071-6/+5
|
* lavfi/alphaextract: copy width and not linesize.Clément Bœsch2013-05-071-2/+1
| | | | Padding data is not supposed to be copied.
* sws: factorize rgb 9+ planar funcs declarations.Clément Bœsch2013-05-071-109/+21
|
* Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-05-071-0/+22
|\ | | | | | | | | | | | | * cehoyos/master: Support decoding of Lagarith frame type FRAME_SOLID_COLOR. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Support decoding of Lagarith frame type FRAME_SOLID_COLOR.Carl Eugen Hoyos2013-05-071-0/+22
| | | | | | | | Fixes bug 459.
* | Ticket #2540 Enable threading when using -c:v libx264rgbGunther Piez2013-05-071-1/+1
| | | | | | | | | | Signed-off-by: Gunther Piez <gupiez@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/av_pix_fmt_swap_endianness: simplify and fix codeMichael Niedermayer2013-05-071-40/+12
|/ | | | | | | This makes the code also more robust, not having a hard-coded table that can become (and was) incomplete. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-072-3/+3
|\ | | | | | | | | | | | | | | | | | | * qatar/master: fate-jpeg2000-dcinema: force output to xyz12le Conflicts: tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate-jpeg2000-dcinema: force output to xyz12leJanne Grunau2013-05-061-1/+1
| | | | | | | | Fixes Fate tests on big-endian configs.
* | Merge commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110'Michael Niedermayer2013-05-078-2/+18
|\| | | | | | | | | | | | | | | | | | | * commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110': vf_scale: add endianness conversion pixel format in query_formats Conflicts: libavfilter/vf_scale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_scale: add endianness conversion pixel format in query_formatsJanne Grunau2013-05-061-2/+4
| |
* | Merge commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c'Michael Niedermayer2013-05-071-2/+2
|\| | | | | | | | | | | | | | | | | | | | | * commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c': swscale: support endianness conversion for AV_PIX_FMT_XYZ12 Conflicts: libswscale/swscale_unscaled.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: support endianness conversion for AV_PIX_FMT_XYZ12Janne Grunau2013-05-062-1/+4
| |
* | Merge commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491'Michael Niedermayer2013-05-073-2/+20
|\| | | | | | | | | | | | | | | | | | | | | * commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491': swscale: add support for endianness only conversion Conflicts: libswscale/utils.c libswscale/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: add support for endianness only conversionJanne Grunau2013-05-063-2/+20
| | | | | | | | Use bitfields in FormatEntry array to avoid wasting an int for each flag.
* | Merge commit '74652af821d7e526a6541876a637fbf81261fa8e'Michael Niedermayer2013-05-073-1/+60
|\| | | | | | | | | | | | | | | | | | | | | * commit '74652af821d7e526a6541876a637fbf81261fa8e': pixdesc: add function to return pixel format with swapped endiannes Conflicts: libavutil/pixdesc.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pixdesc: add function to return pixel format with swapped endiannesJanne Grunau2013-05-063-1/+60
| |
* | Add FATE test for matroska error recovery.Reimar Döffinger2013-05-072-0/+220
| | | | | | | | | | | | | | | | This is the first 2 MB of the official test7.mkv. That length seems to be enough to detect the bugs we had in our code so far. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | matroska: set "done" only during resync fail.Reimar Döffinger2013-05-071-1/+0
| | | | | | | | | | | | Fixes playback of test7.mkv validation test file. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | avcodec/utils: Fix leak by dereferencing audio frame when side data causes ↵Matt Wolenetz2013-05-071-0/+2
| | | | | | | | | | | | whole frame skip Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000dec: fix memleaks in error cases in jpeg2000_decode_frame()Michael Niedermayer2013-05-061-4/+7
| | | | | | | | | | Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mpsub: remove sscanf from probing.Clément Bœsch2013-05-061-4/+3
| | | | | | | | This should make probing faster.
* | Cosmetics: Fix indentation and add braces after last commit.Carl Eugen Hoyos2013-05-061-3/+3
| |
* | vc1dec: Call ff_vdpau_vc1_decode_picture() once for each field.Carl Eugen Hoyos2013-05-061-0/+5
| | | | | | | | Fixes mplayer -vc ffvc1vdpau for interlaced streams.
* | Fix vdpau vc1 interlace modes also when using decoder vc1_vdpau.Rainer Hochecker2013-05-061-1/+1
| | | | | | | | Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-061-6/+6
|\| | | | | | | | | | | | | * qatar/master: swscale: Use alpha from the right row in yuva2rgba_c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: Use alpha from the right row in yuva2rgba_cMartin Storsjö2013-05-061-6/+6
| | | | | | | | | | | | | | | | | | | | Every other pixel had the alpha channel taken from the wrong row. This fixes bug 504. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50'Michael Niedermayer2013-05-062-15/+15
|\| | | | | | | | | | | | | | | | | | | | | * commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50': swscale: Remove unnecessary backslashes jpeg2000: Fix uninitialized data errors pointed out by valgrind/memcheck Conflicts: libavcodec/jpeg2000dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: Remove unnecessary backslashesMartin Storsjö2013-05-061-8/+8
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * jpeg2000: Fix uninitialized data errors pointed out by valgrind/memcheckNicolas Bertrand2013-05-061-4/+13
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | jpeg2000: fix for uninitialized data errors in valgrind/memcheckNicolas Bertrand2013-05-061-4/+14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '110796739ab32854dc0b6b0a1c95e6ae98889062'Michael Niedermayer2013-05-065-25/+58
|\| | | | | | | | | | | | | | | | | | | * commit '110796739ab32854dc0b6b0a1c95e6ae98889062': x86: hpeldsp: Move avg_pixels8_x2_mmx() out of hpeldsp_rnd_template.c Conflicts: libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: hpeldsp: Move avg_pixels8_x2_mmx() out of hpeldsp_rnd_template.cDiego Biurrun2013-05-065-25/+58
| | | | | | | | | | The function is only instantiated once, so there is no point in keeping it in a template file.