summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'cc3e88a2b9e7ecf62e4ea1c41ce1623cea67ee96'Michael Niedermayer2014-08-13
|\ | | | | | | | | | | | | | | | | | | * commit 'cc3e88a2b9e7ecf62e4ea1c41ce1623cea67ee96': mov: update AVFormatContext.event_flags with METADATA_UPDATED whenever metadata changes. Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: update AVFormatContext.event_flags with METADATA_UPDATED whenever ↵Andrew Stone2014-08-13
| | | | | | | | | | | | metadata changes. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'fa3a5dd4dea34baa6bb2f7fe6006fc4b2888f2aa'Michael Niedermayer2014-08-13
|\| | | | | | | | | | | | | * commit 'fa3a5dd4dea34baa6bb2f7fe6006fc4b2888f2aa': nutdec: update AVFormatContext.event_flags with STREAM_/METADATA_UPDATED whenever metadata changes. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nutdec: update AVFormatContext.event_flags with STREAM_/METADATA_UPDATED ↵Andrew Stone2014-08-13
| | | | | | | | | | | | whenever metadata changes. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '0f789322efa78a672e4c3027e5cc12b8a947043a'Michael Niedermayer2014-08-13
|\| | | | | | | | | | | | | * commit '0f789322efa78a672e4c3027e5cc12b8a947043a': flvdec: update AVFormatContext.event_flags with METADATA_UPDATED whenever metadata changes. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: update AVFormatContext.event_flags with METADATA_UPDATED whenever ↵Andrew Stone2014-08-13
| | | | | | | | | | | | metadata changes. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '93c04e095dc37ebdab22174e88cfa91e24940866'Michael Niedermayer2014-08-13
|\| | | | | | | | | | | | | * commit '93c04e095dc37ebdab22174e88cfa91e24940866': Expose metadata found in onCuePoint events in .flv files. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Expose metadata found in onCuePoint events in .flv files.Andrew Stone2014-08-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, only onMetaData is used, but some providers (wrongly) put metadata into onCuePoint events, and it's still nice to be able to use that data. onCuePoint events also present metadata slightly differently than onMetaData events: all metadata is found inside an object called "parameters". In order to extract this metadata, it's easiest to recurse through the object tree and pull out anything found in child objects and put it in the top-level metadata. Reference: http://help.adobe.com/en_US/FlashPlatform/reference/actionscript/2/help.html?content=00001404.html Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '019d3fccc4dcf5c8379112f697ce9eb08edee9b9'Michael Niedermayer2014-08-13
|\| | | | | | | | | | | | | | | | | | | * commit '019d3fccc4dcf5c8379112f697ce9eb08edee9b9': Set protocol-level metadata in AVFormatContext any time a packet is read. Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Set protocol-level metadata in AVFormatContext any time a packet is read.Andrew Stone2014-08-13
| | | | | | | | | | | | | | If any option named "metadata" is set inside the context, it is pulled up to the context and then the option is cleared. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '7e38903b5c86a759549e70647ae42bb22d353b14'Michael Niedermayer2014-08-13
|\| | | | | | | | | | | | | | | | | | | | | * commit '7e38903b5c86a759549e70647ae42bb22d353b14': http: enable icy metadata by default. Conflicts: Changelog libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * http: enable icy metadata by default.Andrew Stone2014-08-13
| | | | | | | | | | | | | | It won't hurt servers that don't care about the header, and those that do will include it by default. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '7601f9412a2d3387617a45966b65b452a632c27a'Michael Niedermayer2014-08-13
|\| | | | | | | | | | | | | * commit '7601f9412a2d3387617a45966b65b452a632c27a': http: export icecast metadata as an option with name "metadata". Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * http: export icecast metadata as an option with name "metadata".Andrew Stone2014-08-13
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'a8c104a511f97e4ea617df73b31737e28a8a5126'Michael Niedermayer2014-08-13
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'a8c104a511f97e4ea617df73b31737e28a8a5126': AVOption: add support for dictionary types. Conflicts: libavutil/opt.c libavutil/opt.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * AVOption: add support for dictionary types.Andrew Stone2014-08-13
| | | | | | | | | | | | | | In order to support metadata being set as an option, it's necessary to be able to set dictionaries as values. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'afbd4b7e093adf6d7a830b32759ca3ba8500363d'Michael Niedermayer2014-08-13
|\| | | | | | | | | | | | | | | | | | | | | * commit 'afbd4b7e093adf6d7a830b32759ca3ba8500363d': lavf: add AVFormatContext/AVStream fields for signaling to the user when events happen. Conflicts: libavformat/avformat.h libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: add AVFormatContext/AVStream fields for signaling to the user when ↵Andrew Stone2014-08-13
| | | | | | | | | | | | | | | | | | | | | | events happen. The only flags, for now, indicate if metadata was updated and are set after each call to av_read_frame(). This comes with the caveat that, on stream start, it might not be set properly as packets might be buffered in AVFormatContext.packet_buffer before being given to the user in av_read_frame(). Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | reset and complete RELEASE_NOTES for the next versionClément Bœsch2014-08-13
| |
* | vp9: ignore reference segmentation map if error_resilience flag is set.Ronald S. Bultje2014-08-13
| | | | | | | | | | | | Fixes ffvp9_fails_where_libvpx.succeeds.webm from ticket 3849. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Changelog: notify about the recent performance boost in dctdnoiz filterClément Bœsch2014-08-13
| |
* | avfilter/dctdnoiz: add slice threadingClément Bœsch2014-08-13
| |
* | Merge commit '72199e1041b4052544e181ad90b431ca6704da12'Michael Niedermayer2014-08-13
|\| | | | | | | | | | | | | | | * commit '72199e1041b4052544e181ad90b431ca6704da12': configure: Check for nanosleep in headers as well, not only in libs See: 223c374a9d977fdfe9af94858693c632f644aac7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Check for nanosleep in headers as well, not only in libsMartin Storsjö2014-08-13
| | | | | | | | | | | | | | | | | | On mingw64 with c++11 support, the link libraries do contain a nanosleep function, while it isn't exposed via the headers. Using check_func_headers instead of a plain check_func fixes this misdetection. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '428b0578c64241fc677fed7083cc8fe65e10f32e'Michael Niedermayer2014-08-13
|\| | | | | | | | | | | | | * commit '428b0578c64241fc677fed7083cc8fe65e10f32e': w32threads: Use newer thread synchronization functions when targeting Vista Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * w32threads: Use newer thread synchronization functions when targeting VistaMartin Storsjö2014-08-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When explicitly targeting Vista or newer (which only happens if the caller explicitly sets _WIN32_WINNT to a high enough value via the extra cflags option - otherwise configure script sets -D_WIN32_WINNT=0x0502), we already unconditionally link to the ConditionVariable functions, since 4622f11f9. Similarly use the newer -Ex versions of CreateEvent, CreateSemaphore, InitializeCriticalSection and WaitForSingleObject, that all appeared in Vista. When building Windows Store applications, the older versions of these functions aren't available, only the -Ex functions. When doing such a build, the user can set -D_WIN32_WINNT=0x0600 to forcibly use the newer functions instead. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8bf3bf69ad7333bf0c45f4d2797fc2c61bc8922f'Michael Niedermayer2014-08-13
|\| | | | | | | | | | | | | * commit '8bf3bf69ad7333bf0c45f4d2797fc2c61bc8922f': http: Stop reading after receiving the whole file for non-chunked transfers Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * http: Stop reading after receiving the whole file for non-chunked transfersMartin Storsjö2014-08-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this logic was only used if the server didn't respond with Connection: close, but use it even for that case, if the server response is non-chunked. Originally the http code has relied on Connection: close to close the socket when the file/stream is received - the http protocol code just kept reading from the socket until the socket was closed. In f240ed18 we added a check for the file size, because some http servers didn't respond with Connection: close (and wouldn't close the socket) even though we requested it, which meant that the http protocol blocked for a long time at the end of files, waiting for a socket level timeout. When reading over tls, trying to read at the end of the connection, when the peer has closed the connection, can produce spurious (but harmless) warnings. Therefore always voluntarily stop reading when the specified file size has been received, if not using a chunked transfer encoding. (For chunked transfers, we already return 0 as soon as we get the chunk header indicating end of stream.) Signed-off-by: Martin Storsjö <martin@martin.st>
* | doc/filters: correct confusing statements about *showinfo shown valuesStefano Sabatini2014-08-13
| | | | | | | | Fix trac issue #3850.
* | avfitler/vf_perspective: support slice threadingPaul B Mahol2014-08-13
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avutil: turn arm setend into a cpuflagMichael Niedermayer2014-08-13
| | | | | | | | | | | | | | | | | | | | | | this allows disabling and enabling it it also prevents crashes if vfpv3 and neon are disabled which previously would have enabled the flag And last but not least one can enable setend on cpus like cortex-a8 where its fast but disabled by default Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/dnxhd: ff_dnxhd_cid_table is not exportedJames Almer2014-08-13
| | | | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cvcodec/flacdsp_lpc_template: osmetic fixJames Darnley2014-08-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/flacenc: partially unroll loop in flac_enc_lpc_16James Darnley2014-08-13
| | | | | | | | | | | | | | | | | | | | | | | | It now does 12 samples per iteration, up from 4. From 1.8 to 3.2 times faster again. 3.6 to 5.7 times faster overall. Runtime is reduced by a further 2 to 18%. Overall runtime reduced by 4 to 50%. Same conditions as before apply. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/idctdsp: make add/put_pixels_clamped_c internal functionsJames Almer2014-08-13
| | | | | | | | | | | | | | This reduces code duplication and differences with the fork. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/flacenc: add sse4 version of the 16-bit lpc encoderJames Darnley2014-08-13
| | | | | | | | | | | | | | | | | | | | From 1.8 to 2.4 times faster. Runtime is reduced by 2 to 39%. The speed-up generally increases with compression_level. This lpc encoder is not used with levels < 3 so it provides no speed-up in these cases. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi: duplicate ff_log2_tabJames Almer2014-08-13
| | | | | | | | | | | | | | Fixes compilation failures on msvc/icl shared builds Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: add C xvid IDCT supportPascal Massimino2014-08-12
| | | | | | | | | | | | | | | | | | Thanks to Pascal Massimino and Michael Militzer for permission to use under LGPL The xvid idct code is from xvid, and nearly unchanged to make future syncing easy the integration into ffmpeg is done by the commiter the commit message is written by the commiter Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lsws: duplicate ff_log2_tabJames Almer2014-08-12
| | | | | | | | | | | | | | | | | | libswscale uses the table but wasn't duplicating it like the rest of the libs. This should fix compilation failures on msvc/icl after lavu stopped exporting internal functions and tables. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'da7d839a0d3ec40423a665dc85e0cfaed3f92eb8'Michael Niedermayer2014-08-12
|\| | | | | | | | | | | | | | | | | | | | | * commit 'da7d839a0d3ec40423a665dc85e0cfaed3f92eb8': ffv1dec: check that global parameters do not change in version 0/1 Conflicts: libavcodec/ffv1dec.c See: b05cd1ea7e45a836f7f6071a716c38bb30326e0f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffv1dec: check that global parameters do not change in version 0/1Michael Niedermayer2014-08-12
| | | | | | | | | | | | | | | | | | Such changes are neither allowed nor supported Found-by: ami_stuff Bug-Id: CVE-2013-7020 CC: libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '3187fa14a326908f9471a038e3b5b24c0eaf655e'Michael Niedermayer2014-08-12
|\| | | | | | | | | | | | | | | * commit '3187fa14a326908f9471a038e3b5b24c0eaf655e': hevc_mvs: avoid deriving tmvp in amvp See: 373677f95816924a3790c174e83ec2e378962c44 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc_mvs: avoid deriving tmvp in amvpChristophe Gisquet2014-08-12
| | | | | | | | | | | | | | | | Reduces the number of calls to tmvp derivation from 933685 to 586271 on a sequence. Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '14ca0aa69b5d954ce56d0826ab9f1f70e535c92a'Michael Niedermayer2014-08-12
|\| | | | | | | | | | | | | | | | | | | | | * commit '14ca0aa69b5d954ce56d0826ab9f1f70e535c92a': hevc: wait proper position for tmvp Conflicts: libavcodec/hevc_mvs.c See: ed248e7f70d98abe099392e154d1cdd0f15faa3c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: wait proper position for tmvpChristophe Gisquet2014-08-12
| | | | | | | | | | | | | | | | | | The position is either rounded or not checked, so delay the wait to check the proper value. Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'cf6090dc6252f2b276aa4133e3d73a89f4c6046c'Michael Niedermayer2014-08-12
|\| | | | | | | | | | | | | | | | | | | | | * commit 'cf6090dc6252f2b276aa4133e3d73a89f4c6046c': hevc: use intreadwrite Conflicts: libavcodec/hevc_mvs.c See: 7a4a5515b0ce97f1c4e18ed012cc3f86328dd220 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: use intreadwriteChristophe Gisquet2014-08-12
| | | | | | | | | | | | When dealing with MVs, both components may be processed at a time. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'ed53cc217f6a6e4ddb35e3f01a79496091dc82dc'Michael Niedermayer2014-08-12
|\| | | | | | | | | | | | | | | | | | | | | * commit 'ed53cc217f6a6e4ddb35e3f01a79496091dc82dc': hevc: derive partial merge list Conflicts: libavcodec/hevc_mvs.c See: 4576eff05d94a5e0b853a7a595d31351cc539e7b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: derive partial merge listChristophe Gisquet2014-08-12
| | | | | | | | | | | | The merge list only needs to be derived up to the merge index. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '3505b19652ea34089a4cd08d4d3358fcc0a3db8b'Michael Niedermayer2014-08-12
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '3505b19652ea34089a4cd08d4d3358fcc0a3db8b': hevc: derive partially amvp list Conflicts: libavcodec/hevc_mvs.c See: bbeaae96eb6fc623f6bfd4a0dd2fd06e6b620938 See: 3ad046083119abd3b063964bd79797e9935305e1 Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 20:29:53 +0000