summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | avformat/tedcaptionsdec: make const arrays static constMichael Niedermayer2013-08-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/f_sendcmd: make const arrays static constMichael Niedermayer2013-08-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/log: Use bprint for partMichael Niedermayer2013-08-10
| | | | | | | | | | | | This should fix the issue with strings longer than 1024 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/bprint: add av_vbprintf()Michael Niedermayer2013-08-10
| | | | | | | | | | Reviewed-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-10
|\| | | | | | | | | | | | | * qatar/master: libavutil: Make avpriv_open a library-internal function on msvcrt Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavutil: Make avpriv_open a library-internal function on msvcrtMartin Storsjö2013-08-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add one copy of the function into each of the libraries, similarly to what we do for log2_tab. When using static libs, only one copy of the file_open.o object file gets included, while when using shared libraries, each of them get a copy of its own. This fixes DLL builds with a statically linked C runtime, where each DLL effectively has got its own instance of the C runtime, where file descriptors can't be shared across runtimes. On systems not using msvcrt, the function is not duplicated. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'a76d0cdf21c3d9e464623cc0ad1c005abf952afa'Michael Niedermayer2013-08-10
|\| | | | | | | | | | | | | * commit 'a76d0cdf21c3d9e464623cc0ad1c005abf952afa': libavutil: Move avpriv_open to a new file, file_open.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavutil: Move avpriv_open to a new file, file_open.cMartin Storsjö2013-08-10
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'cb0244daaca83ab666798818f74f5181bf6bc387'Michael Niedermayer2013-08-10
|\| | | | | | | | | | | | | * commit 'cb0244daaca83ab666798818f74f5181bf6bc387': bktr: Changed a missed occurrance of open into avpriv_open Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * bktr: Changed a missed occurrance of open into avpriv_openMartin Storsjö2013-08-10
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '33237123c83bf4f8345e6ac889ad2e7dbd303d0e'Michael Niedermayer2013-08-10
|\| | | | | | | | | | | | | * commit '33237123c83bf4f8345e6ac889ad2e7dbd303d0e': libavutil: Enable the MSVC DLL symbol loading workaround in shared builds as well Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavutil: Enable the MSVC DLL symbol loading workaround in shared builds as ↵Martin Storsjö2013-08-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | well This used to only be necessary in static builds (when using the dynamically linked C runtime), since the _imp prefixed symbols do exist when linking to the actual DLL. When building testprogs, however, the current library (e.g. libavutil for some of the testprogs) is linked statically. This fixes make fate on DLL builds when using the dynamically linked C runtime. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '9d5ec50ead97e088d77317e77b18cef06cb3d053'Michael Niedermayer2013-08-10
|\| | | | | | | | | | | | | | | | | | | * commit '9d5ec50ead97e088d77317e77b18cef06cb3d053': ff_socket: put out-of-line and fallback to fcntl() for close-on-exec Conflicts: libavformat/network.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ff_socket: put out-of-line and fallback to fcntl() for close-on-execRémi Denis-Courmont2013-08-09
| | | | | | | | | | | | | | This supports non-Linux systems (SOCK_CLOEXEC is non-standard) and older Linux kernels to the extent possible. Signed-off-by: Martin Storsjö <martin@martin.st>
* | doc/filters: fix sine sample_rate abbreviationMark Harris2013-08-10
| | | | | | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | doc: apply various grammar fixesBryce W. Harrington2013-08-10
| | | | | | | | | | | | | | | | The first sentence of each of the modified man pages are worded a bit awkwardly. These minor copy-edits should make them clearer. Signed-off-by: Bryce Harrington <b.harrington@samsung.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | Integrate accessors.h header into internal.hReimar Döffinger2013-08-10
| | | | | | | | | | | | | | I have no idea why I added a separate header, I think there is no good reason for it. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | avcodec/raw: gbrp supportMichael Niedermayer2013-08-09
| | | | | | | | | | | | Fixes 2nd half of Ticket2274 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nut: support planar rgbMichael Niedermayer2013-08-09
| | | | | | | | | | | | Fixes first half of Ticket2274 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/tiff: remove redundant checkMichael Niedermayer2013-08-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/tiff: avoid seek back on reading tagsMichael Niedermayer2013-08-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/mem: Fix flipped conditionMichael Niedermayer2013-08-09
| | | | | | | | | | | | | | Fixes return code and later null pointer dereference Found-by: Laurent Butti <laurentb@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/paf: Fix integer overflow and out of array readMichael Niedermayer2013-08-09
| | | | | | | | | | Found-by: Laurent Butti <laurentb@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/trim: Fix assertion failure with empty framesMichael Niedermayer2013-08-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/fifo: explicitly assert that a frame should have become available ↵Michael Niedermayer2013-08-09
| | | | | | | | | | | | | | | | after request May help tools like coverity Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-09
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: FATE: add a TAK test Conflicts: tests/fate/lossless-audio.mak No change as we already have a tak test with luckynight-partial.tak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * FATE: add a TAK testAnton Khirnov2013-08-08
| |
* | Merge commit 'dfc6b5c81491abf7effb97b23af17ccf7adcd132'Michael Niedermayer2013-08-09
|\| | | | | | | | | | | | | * commit 'dfc6b5c81491abf7effb97b23af17ccf7adcd132': file: Move win32 utf8->wchar open wrapper to libavutil Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * file: Move win32 utf8->wchar open wrapper to libavutilMartin Storsjö2013-08-08
| | | | | | | | | | | | | | | | | | | | | | | | | | When libavformat was changed to use the new avpriv_open function in 51eb213d001, this silently bypassed the existing wrapper for win32. Move the win32 wrapper into libavutil/file.c to make sure it gets called everywhere (not just in the libavformat case). This makes sure that non-ascii file names gets opened properly (where file names internally are stored as utf8, but they get converted to wchar_t and opened with _wsopen). Signed-off-by: Martin Storsjö <martin@martin.st>
* | ffplay: check for filter EOF return codesMarton Balint2013-08-09
| | | | | | | | | | | | Fixes ticket #2800. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: ensure the decoder is flushed before exiting or loopingMarton Balint2013-08-09
| | | | | | | | | | | | | | | | | | | | Also make sure that we only exit or restart the video if it is not paused and if the picture queue is empty. There is still room for improvement (filters may also buffer some frames), but the patch fixes the most common use cases and ticket #2783 as well. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: fix memleak of non-bitmap subtitlesMarton Balint2013-08-09
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: free subtitle pictures on exitMarton Balint2013-08-09
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | avfilter/vf_perspective: factor u cliping codeMichael Niedermayer2013-08-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | MAINTAINERS: add Alexander Strasser for the serverMichael Niedermayer2013-08-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Reduce MAKE_ACCESSORS code duplication via a new header.Reimar Döffinger2013-08-08
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | MAINTAINERS: remove myself from movenc, 2 maintainers should be enoughMichael Niedermayer2013-08-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | MAINTAINERS: add myself as maintainer for lavf/aiff* and lavf/movenc.cMatthieu Bouron2013-08-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/bitstream: Dont try to free buffers for static VLCsMichael Niedermayer2013-08-08
| | | | | | | | | | | | | | | | | | | | Such buffers are not malloced thus freeing would be bad. Note though this condition never could have happened so this is more for correctness sake and not a true bugfix Fixes CID1061047 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-08
|\| | | | | | | | | | | | | * qatar/master: arm: Add assembly version of h264_find_start_code_candidate Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: Add assembly version of h264_find_start_code_candidateBen Avison2013-08-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Before After Mean StdDev Mean StdDev Change This function 508.8 23.4 185.4 9.0 +174.4% Overall 3068.5 31.7 2752.1 29.4 +11.5% In combination with the preceding patch: Before After Mean StdDev Mean StdDev Change Overall 2925.6 26.2 2752.1 29.4 +6.3% Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '218d6844b37d339ffbf2044ad07d8be7767e2734'Michael Niedermayer2013-08-08
|\| | | | | | | | | | | | | | | | | | | * commit '218d6844b37d339ffbf2044ad07d8be7767e2734': h264dsp: Factorize code into a new function, h264_find_start_code_candidate Conflicts: libavcodec/h264_parser.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264dsp: Factorize code into a new function, h264_find_start_code_candidateBen Avison2013-08-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This performs the start code search which was previously part of h264_find_frame_end() - the most CPU intensive part of the function. By itself, this results in a performance regression: Before After Mean StdDev Mean StdDev Change Overall time 2925.6 26.2 3068.5 31.7 -4.7% but this can more than be made up for by platform-optimised implementations of the function. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '7a82022ee2f9b1fad991ace0936901e7419444be'Michael Niedermayer2013-08-08
|\| | | | | | | | | | | | | * commit '7a82022ee2f9b1fad991ace0936901e7419444be': h264_parser: Initialize the h264dsp context in the parser as well Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_parser: Initialize the h264dsp context in the parser as wellBen Avison2013-08-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each AVStream struct for an H.264 elementary stream actually has two copies of the H264DSPContext struct (and in fact all the other members of H264Context as well): ((H264Context *) ((AVStream *)st)->codec->priv_data)->h264dsp ((H264Context *) ((AVStream *)st)->parser->priv_data)->h264dsp but only the first of these was actually being initialised. This prevented the addition of platform-specific implementations of parser-related functions. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '3e5898782dce60334ab294821ca00b19c648cf66'Michael Niedermayer2013-08-08
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '3e5898782dce60334ab294821ca00b19c648cf66': Voxware MetaSound decoder Conflicts: Changelog libavcodec/Makefile libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Voxware MetaSound decoderKostya Shishkov2013-08-08
| |
* | Merge commit '5afe1d27912be9b643ffb4ddc21f6d920260dbb0'Michael Niedermayer2013-08-08
|\| | | | | | | | | | | | | | | | | | | * commit '5afe1d27912be9b643ffb4ddc21f6d920260dbb0': avio: Add const qualifiers to ffio_read_indirect Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: Add const qualifiers to ffio_read_indirectBen Avison2013-08-08
| | | | | | | | | | | | | | This provides at least some protection against potential accidental corruption of AVIO buffer workspace. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '0f1fb6c0194c85483dedb93b20a5b76f6fc9d520'Michael Niedermayer2013-08-08
|\| | | | | | | | | | | | | | | * commit '0f1fb6c0194c85483dedb93b20a5b76f6fc9d520': libavutil: Don't use fcntl if the function does not exist cmdutils: Only do the windows-specific commandline parsing on _WIN32 Merged-by: Michael Niedermayer <michaelni@gmx.at>