summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487'Michael Niedermayer2013-05-0557-87/+162
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * avcodec: Add av_cold attributes to init functions missing themDiego Biurrun2013-05-0457-87/+161
| |
* | Merge commit '72e228b274a98af1aba9588415d0cd87fde44663'Michael Niedermayer2013-05-051-136/+140
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '72e228b274a98af1aba9588415d0cd87fde44663': nut: K&R formatting cosmetics Conflicts: libavformat/nut.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: K&R formatting cosmeticsLuca Barbato2013-05-041-137/+141
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | configure: fix valgrind-memcheck argumentsMichael Niedermayer2013-05-051-1/+1
| | | | | | | | | | | | They now match the --valgrind arguments Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b1ee8eec849f17fce2f411a297de9cbf2edaeb3a'Michael Niedermayer2013-05-052-2/+18
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'b1ee8eec849f17fce2f411a297de9cbf2edaeb3a': configure: Add basic valgrind-memcheck support Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Add basic valgrind-memcheck supportReinhard Tartler2013-05-042-2/+18
| | | | | | | | | | | | | | | | 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.
* | Merge commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07'Michael Niedermayer2013-05-051-2/+3
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07': build: normalize coverage.info Conflicts: tests/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: normalize coverage.infoReinhard Tartler2013-05-041-1/+3
| | | | | | | | | | Without this, lcov sometimes misses to normalize paths that contain "/./". Also, ignore uninteresting hits in system headers.
* | Merge commit '768e44d044bc32de1e58c198a3708d186af7e966'Michael Niedermayer2013-05-051-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '768e44d044bc32de1e58c198a3708d186af7e966': build: tune down the output of lcov/gcov Conflicts: tests/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: tune down the output of lcov/gcovReinhard Tartler2013-05-041-2/+2
| | | | | | | | In the default settings, both tools produce a lot of unhelpful noise.
* | Detect and skip mj2-style jp2c header.Reimar Döffinger2013-05-051-0/+2
| | | | | | | | | | | | | | | | | | 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>
* | Avoid incorrect deprecated pixel format warning.Reimar Döffinger2013-05-051-1/+2
| | | | | | | | | | | | | | 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>
* | AAC encoder: Fix rate control on twoloop.Claudio Freire2013-05-051-1/+1
| | | | | | | | | | | | | | | | 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>
* | AAC encoder: Fixed a rounding bug in psy's channel bitrate computation.Claudio Freire2013-05-051-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | src_movie: fix scanf stringMichael Niedermayer2013-05-051-3/+3
| | | | | | | | | | | | Fixes out of array accesses Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | xbmdec: fix off by one error in scanf()Michael Niedermayer2013-05-051-1/+1
| | | | | | | | | | | | Fixes out of array access Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: Always decode MMCOs into temprary arrayMichael Niedermayer2013-05-041-1/+2
| | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2013-05-044-3/+17
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * | lavf/matroskaenc: return an error for unsupported types.Nicolas George2013-05-041-1/+1
| | |
| * | lavf/concatdec: remove invalid check for AVSEEK_FLAG_BACKWARD.Nicolas George2013-05-041-1/+1
| | |
| * | lavf: filter out AVSEEK_FLAG_BACKWARD in new API.Nicolas George2013-05-042-0/+2
| | | | | | | | | | | | Also document that it has no effect.
| * | lavf: call the new seek API from the old.Nicolas George2013-05-041-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | wmaprodec: Fix null pointer dereference in decode_frame()Michael Niedermayer2013-05-041-1/+2
| | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | dfa: Put our pointer check back.Michael Niedermayer2013-05-041-0/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | aacdec: free frame buffer if no audio was decodedHendrik Leppkes2013-05-041-0/+2
| | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-041-10/+10
|\ \ | |/ | | | | | | | | | | | | | | | | * qatar/master: wav: return meaningful errors Conflicts: libavformat/wavdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wav: return meaningful errorsLuca Barbato2013-05-031-9/+9
| |
* | Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'Michael Niedermayer2013-05-0413-19/+20
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7': silly typo fixes Conflicts: doc/protocols.texi libavcodec/aacpsy.c libavformat/utils.c tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * silly typo fixesDiego Biurrun2013-05-0314-20/+21
| |
* | Merge commit '4a7af92cc80ced8498626401ed21f25ffe6740c8'Michael Niedermayer2013-05-042-65/+65
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * sbrdsp: Unroll and use integer operationsChristophe Gisquet2013-05-031-12/+27
| | | | | | | | | | | | | | | | | | | | | | | | This patch can be controversial, by assuming floats are IEEE-754 and particular behaviour of the FPU will get in the way. Timing on Arrandale and Win32 (thus, x87 FPU is used in the reference). sbr_qmf_pre_shuffle_c: 115 to 76 sbr_neg_odd_64_c: 84 to 55 sbr_qmf_post_shuffle_c: 112 to 83 Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * sbrdsp: Unroll sbr_autocorrelate_cChristophe Gisquet2013-05-031-0/+25
| | | | | | | | | | | | 1410 cycles to 1148 on Arrandale/Win64 Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * x86: sbrdsp: Implement SSE2 qmf_deint_bflyChristophe Gisquet2013-05-032-0/+33
| | | | | | | | | | | | | | | | | | | | Sandybridge: 47 cycles Having a loop counter is a 7 cycle gain. Unrolling is another 7 cycle gain. Working in reverse scan is another 6 cycles. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | evrcdec: fix sign errorMichael Niedermayer2013-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | 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>
* | snow: Fix off by 1 error in reference picture managementMichael Niedermayer2013-05-041-1/+1
| | | | | | | | | | | | | | | | 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>
* | eamad: Check against minimum supported dimensionsMichael Niedermayer2013-05-031-0/+5
| | | | | | | | | | | | | | Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/filters: document asetpts in single placePaul B Mahol2013-05-031-72/+11
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavu: add planar 16 bit and 8 bit rgb with alphaPaul B Mahol2013-05-034-2/+47
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavfi/testsrc: add support for color interactive commandStefano Sabatini2013-05-033-1/+45
| |
* | extractplanes filterPaul B Mahol2013-05-036-1/+296
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | vc1dec: fix lutuv use in vc1_mc_4mv_chroma4()Michael Niedermayer2013-05-031-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1dec: Fix mixed field/frame intensity compensationMichael Niedermayer2013-05-031-26/+32
| | | | | | | | | | | | Fixes Ticket2523 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1dec: vc1_mc_4mv_chroma4: match addressing between compensation and MCMichael Niedermayer2013-05-031-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/frei0r: fix crash when parameters are not set.Clément Bœsch2013-05-031-0/+3
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-032-2/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: compat: msvc: Make sure the object files are included when linking statically id3v2: check for end of file while unescaping tags Conflicts: configure libavformat/id3v2.c Note, ffmpeg is not affected by the out of buffer write bug Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * compat: msvc: Make sure the object files are included when linking staticallyMartin Storsjö2013-05-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If building libav with -MD in the cflags (for making the MSVC compiler generate code for using a dynamically linked libc), the system headers that declare strtod, snprintf and vsnprintf declare the functions as imported from a DLL. To hook up wrappers of our own for these functions, the function names are defined to avpriv_*, so that the calling code within libav calls the wrappers instead. Since these functions are declared to be imported from DLLs, the calling code expects to load them from DLL import function pointers (creating references to _imp__avpriv_strtod instead of directly to avpriv_strtod). If the libav libraries are not built as DLLs, no such function pointers (as the calling code expects) are created. The linker can fix this up automatically in some cases (producing warnings LNK4217 and LNK4049), if the object files are already included. By telling the linker to try to include those symbols (without the _imp prefix as the calling code ends up using), we get the object files included, so that the linker can do the automatic fixup. This is done via config.h, so that all (or at least most) of the object files in our libraries force including the compat files, to make sure they are included regardless of what files from our static libraries actually are included. Signed-off-by: Martin Storsjö <martin@martin.st>
| * id3v2: check for end of file while unescaping tagsLuca Barbato2013-05-031-2/+3
| | | | | | | | | | | | | | Prevent a serious out of buffer bound write. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
* | ffmpeg: drop old non monotone dts workaround.Michael Niedermayer2013-05-031-11/+0
| | | | | | | | | | | | All bugs should now be fixed in the new so the old can be droped. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: set correct log context for non monotone dts workaround warningsMichael Niedermayer2013-05-031-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status