summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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>
| * libavutil: Don't use fcntl if the function does not existDerek Buitenhuis2013-08-08
| | | | | | | | | | | | | | Not all platforms have the function. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
| * cmdutils: Only do the windows-specific commandline parsing on _WIN32Diogo Franco2013-08-08
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes commandline parsing on Cygwin (on 64 bit, and on very recent 32 bit), where the configure check does find the CommandLineToArgvW function (since it exists in the link libraries and in the headers), but whose GetCommandLineW() only returns the application's path. (This is due to a cygwin internal optimization, see http://cygwin.com/ml/cygwin/2013-07/msg00538.html for details.) Arguments are only given through main's argc/argv, and they're already UTF-8. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '51eb213d00154b8e7856c7667ea62db8b0f663d4'Michael Niedermayer2013-08-08
|\| | | | | | | | | | | | | * commit '51eb213d00154b8e7856c7667ea62db8b0f663d4': libavformat: use avpriv_open() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavformat: use avpriv_open()Rémi Denis-Courmont2013-08-07
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '71bf6b41d974229a06921806c333ce98566a5d8a'Michael Niedermayer2013-08-08
|\| | | | | | | | | | | | | | | | | | | * commit '71bf6b41d974229a06921806c333ce98566a5d8a': libavdevice: use avpriv_open() Conflicts: libavdevice/v4l2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavdevice: use avpriv_open()Rémi Denis-Courmont2013-08-07
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'fee9db1fdf921295233e94cbe2769f9cd722206d'Michael Niedermayer2013-08-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fee9db1fdf921295233e94cbe2769f9cd722206d': libavcodec: use avpriv_open() Conflicts: libavcodec/libxvid_rc.c The changed code does not exist in ffmpeg anymore, thus nothing is changed. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavcodec: use avpriv_open()Rémi Denis-Courmont2013-08-07
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '880391ed2d2faf796ca3a16f63cec69767546a21'Michael Niedermayer2013-08-08
|\| | | | | | | | | | | | | | | | | | | * commit '880391ed2d2faf796ca3a16f63cec69767546a21': libavutil: use avpriv_open() Conflicts: libavutil/random_seed.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavutil: use avpriv_open()Rémi Denis-Courmont2013-08-07
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | libavutil: Don't use fcntl if the function does not existDerek Buitenhuis2013-08-08
| | | | | | | | | | | | | | Not all platforms have the function. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '869b04e89154cd92d2bcfdabcecbe3217864c099'Michael Niedermayer2013-08-08
|\| | | | | | | | | | | | | * commit '869b04e89154cd92d2bcfdabcecbe3217864c099': libavutil: add avpriv_open() to open files with close-on-exec flag Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavutil: add avpriv_open() to open files with close-on-exec flagRémi Denis-Courmont2013-08-07
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '22c879057ead189c0f59241cb9eeb926381e3299'Michael Niedermayer2013-08-08
|\| | | | | | | | | | | | | * commit '22c879057ead189c0f59241cb9eeb926381e3299': mpegvideo_enc: drop outdated copy_picture_attributes() in favour of a modern av_frame_copy_props() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo_enc: drop outdated copy_picture_attributes() in favour of a modern ↵Vittorio Giovara2013-08-07
| | | | | | | | | | | | av_frame_copy_props() Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'f4d371b9737c0405b3bc46d7ca0c856c0a8616b1'Michael Niedermayer2013-08-08
|\| | | | | | | | | | | | | * commit 'f4d371b9737c0405b3bc46d7ca0c856c0a8616b1': rtsp: Don't include the listen flag in the SDP demuxer flags Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: Don't include the listen flag in the SDP demuxer flagsMartin Storsjö2013-08-07
| | | | | | | | | | | | | | It's only relevant for the RTSP demuxer. Similarly, the custom_io flag is only present in the SDP demuxer options list. Signed-off-by: Martin Storsjö <martin@martin.st>
* | swscale/utils: Fix potential overflow of srcPos*C before converting to 64bitMichael Niedermayer2013-08-08
| | | | | | | | | | | | Fixes CID1061054 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale/utils: Fix potential overflow of dstPos*xInc before converting to 64bitMichael Niedermayer2013-08-08
| | | | | | | | | | | | Fixes CID1061053 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/opt: fix types passed to the format string "%s"Michael Niedermayer2013-08-08
| | | | | | | | | | | | | | | | Fixes gcc warnings Fixes CID1061056 Fixes CID1061057 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2013-08-07
|\ \ | | | | | | | | | | | | | | | | | | | | | * cigaes/master: ffmpeg: remove obsolete workaround in trim insertion. lavu/log: do not skip overwritten lines. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | ffmpeg: remove obsolete workaround in trim insertion.Nicolas George2013-08-07
| | | | | | | | | | | | | | | | | | | | | | | | The bug it was working seems to have been fixed. This change causes ffmpeg to use the trim filter to implement the -t option. FATE tests are updated due to the more accurate handling of the last packets.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-29 19:13:16 +0000