aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* lavc/x86/v210: give cpuflag to INIT macroJames Darnley2014-09-051-10/+12
| | | | | | | This lets the cglobal macro automatically append a suffix to the function name. This means that INIT_XMM avx must be used rather than INIT_AVX. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avfilter/vf_idet: MMX/MMXEXT/SSE2 implementation of idet's filter_line()skal2014-09-046-32/+251
| | | | | | | | integration by Neil Birkbeck, with help from Vitor Sessak. core SSE2 loop by Skal (pascal.massimino@gmail.com) Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'd9792b773516a560ecb99694b8ee745a50027fac'Michael Niedermayer2014-09-041-3/+3
|\ | | | | | | | | | | | | | | | | | | * commit 'd9792b773516a560ecb99694b8ee745a50027fac': Mark 11 release in the changelog Conflicts: Changelog Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Mark 11 release in the changelogDiego Biurrun2014-09-041-6/+9
| | | | | | | | Also fix some typos in the entries for the 11 release.
* | Merge commit '12f0388f9cb32016ac0dacaeca631b088b29bb96'Michael Niedermayer2014-09-041-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '12f0388f9cb32016ac0dacaeca631b088b29bb96': Add release notes for 11. Conflicts: doc/RELEASE_NOTES Mostly not merged Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add release notes for 11.Anton Khirnov2014-09-041-59/+50
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '4d55e9de27894ddfb337b28cd7aa6d14a12666d2'Michael Niedermayer2014-09-043-63/+95
|\| | | | | | | | | | | | | | | | | | | * commit '4d55e9de27894ddfb337b28cd7aa6d14a12666d2': vc1: Split bits used in libavformat into a separate header Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1: Split bits used in libavformat into a separate headerDiego Biurrun2014-09-043-63/+94
| | | | | | | | This reduces inter-library dependencies.
* | Merge commit 'f20518568a77a6138fc74021ce56013ab72907ba'Michael Niedermayer2014-09-048-18/+67
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f20518568a77a6138fc74021ce56013ab72907ba': build: Split WMA frequencies into a separate object file Conflicts: configure libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Split WMA frequencies into a separate object fileDiego Biurrun2014-09-048-18/+67
| | | | | | | | | | These are the only WMA bits shared with binkaudio. Splitting them off reduces the binnkaudio dependency on general WMA code.
* | Merge commit '803f8992f11d1eb301672cd13c685a7b1d04c467'Michael Niedermayer2014-09-041-4/+5
|\| | | | | | | | | | | | | | | | | | | * commit '803f8992f11d1eb301672cd13c685a7b1d04c467': build: cosmetics: Group hwaccel OBJS declarations together Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: cosmetics: Group hwaccel OBJS declarations togetherDiego Biurrun2014-09-041-4/+5
| |
* | Merge commit '2b8b0da09cf0dc2535de42f95110eb633f36d8c8'Michael Niedermayer2014-09-041-10/+8
|\| | | | | | | | | | | | | * commit '2b8b0da09cf0dc2535de42f95110eb633f36d8c8': fdctdsp: cosmetics: Drop one unnecessary if-block level Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fdctdsp: cosmetics: Drop one unnecessary if-block levelDiego Biurrun2014-09-031-10/+8
| |
* | Remove non-free tests/lena.pnm and adapt FATE tests to depend on lena.pnm in ↵Andreas Cadhalpun2014-09-045-117/+10
| | | | | | | | | | | | the SAMPLES directory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvdec: read the correct bits into the tag typeSteven Liu2014-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from the flv spec, the flvtag define the tagtype as one byte, the spec desc is: Reserved UB[2] Reserved for FMS, should be 0 Filter UB[1] Indicates if packets are filtered. 0 = No pre-processing required. 1 = Pre-processing (such as decryption) of the packet is required before it can be rendered. Shall be 0 in unencrypted files, and 1 for encrypted tags. See Annex F. FLV Encryption for the use of filters. TagType UB[5] Type of contents in this tag. The following types are defined: 8 = audio 9 = video 18 = script data Signed-off-by: Steven Liu <qi.liu@chinacache.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavdevice/v4l2: fix descriptors leak on error pathsDmitry Volyntsev2014-09-041-17/+20
| | | | | | | | | | | | | | Signed-off-by: Dmitry Volytnsev <xeioexception@gmail.com> Reviewed-by: Benoit Fouet <benoit.fouet@free.fr> Reviewed-by: Giorgio Vazzana <mywing81@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/x11grab: fix error handling in pixel formatsMichael Niedermayer2014-09-041-1/+4
| | | | | | | | | | Reviewed-by: Benoit Fouet <benoit.fouet@free.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | postproc: use FFMIN/FFMAX where appropriateMichael Niedermayer2014-09-042-12/+12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Use makeinfo to generate html doc for the new websiteTimothy Gu2014-09-047-4/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | texi2html is deprecated by upstream in favor of makeinfo/texi2any. See: - https://www.gnu.org/software/texinfo/manual/texinfo/html_node/texi2html.html - https://wiki.debian.org/Texi2htmlTransition - https://lists.debian.org/debian-devel/2013/05/msg01516.html This is actually two separate changes. Based on a patch by Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>. Fixes Trac ticket #3232. Signed-off-by: Timothy Gu <timothygu99@gmail.com>
* | Merge commit 'd2a4e4b9cc9a0c2661e1c1d6f6b51babac2cec1b'Michael Niedermayer2014-09-036-1753/+1742
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'd2a4e4b9cc9a0c2661e1c1d6f6b51babac2cec1b': wma: K&R formatting cosmetics Conflicts: libavcodec/wma.c libavcodec/wmadec.c libavcodec/wmaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wma: K&R formatting cosmeticsGabriel Dume2014-09-036-1758/+1747
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | vorbisenc: avoid large stack allocation.Reimar Döffinger2014-09-031-2/+5
| | | | | | | | | | | | | | Code is only used during initialization, so malloc/free should be fine to use. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | svq1enc: remove pointless array element.Reimar Döffinger2014-09-031-4/+3
| | | | | | | | | | | | Not sure it was meant to be used for something at some point though. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | ffv1enc: reduce stack usage.Reimar Döffinger2014-09-031-1/+7
| | | | | | | | | | | | | | | | A bit more complex than e.g. adding it to the context, but using the context for something that will be used only during initialization seemed a bit wasteful. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | doc/demuxers: document gif demuxerLou Logan2014-09-031-0/+34
| | | | | | | | Signed-off-by: Lou Logan <lou@lrcd.com>
* | libavutil/error: fix build with musl toolchainJörg Krause2014-09-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | Add the feature test macro which is required for building with the musl toolchain. The feature test macro _XOPEN_SOURCE = 600 provides the XSI-compliant version of strerror_r(). Signed-off-by: Jörg Krause <jkrause@posteo.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c487972ed0e1eaebdbe4a13cdd191e119be0b19c'Michael Niedermayer2014-09-031-0/+6
|\| | | | | | | | | | | | | * commit 'c487972ed0e1eaebdbe4a13cdd191e119be0b19c': ismindex: recover from completely empty streams Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: recover from completely empty streamsMika Raento2014-09-031-0/+6
| | | | | | | | | | | | | | This creates best-effort results from input that is missing stream contents, there are warnings printed when this happens. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '95e177eeb21f3e968aa9353bc69d1946966cc835'Michael Niedermayer2014-09-033-102/+67
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '95e177eeb21f3e968aa9353bc69d1946966cc835': rtpdec: HEVC/H.265 support Conflicts: Changelog libavformat/rtpdec_hevc.c libavformat/version.h See: 96b2ba68c4aef4e92b3e9de87d1fb94f2fb659f0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: HEVC/H.265 supportThomas Volkert2014-09-036-1/+379
| | | | | | | | | | | | As specified in draft-ietf-payload-rtp-h265-06. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'ebef9f5a56d7df91e010a177a80cfc8dbe394305'Michael Niedermayer2014-09-031-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ebef9f5a56d7df91e010a177a80cfc8dbe394305': time: Use clock_gettime if the monotonic clock is available Conflicts: configure The change to av_gettime() isnt merged, a patch will be posted to the mailing list that would do the switch Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * time: Use clock_gettime if the monotonic clock is availableLuca Barbato2014-09-032-2/+12
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '65e78a2e4b111627c0ebdf2c9baec95e5e21560d'Michael Niedermayer2014-09-031-75/+71
|\| | | | | | | | | | | | | | | | | | | * commit '65e78a2e4b111627c0ebdf2c9baec95e5e21560d': x11grab: Refactor pixel format parsing Conflicts: libavdevice/x11grab.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x11grab: Refactor pixel format parsingLuca Barbato2014-09-031-60/+57
| |
* | Merge commit 'bb3ead7e54fec205c595cfb8b1d8900d50d3d1cc'Michael Niedermayer2014-09-031-26/+34
|\| | | | | | | | | | | | | * commit 'bb3ead7e54fec205c595cfb8b1d8900d50d3d1cc': x11grab: Fallback to normal XImage if SHM is not supported Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x11grab: Fallback to normal XImage if SHM is not supportedLuca Barbato2014-09-031-26/+34
| |
* | Merge commit 'c19a49e565bd06ea47947d50779ba236df9d4943'Michael Niedermayer2014-09-031-36/+36
|\| | | | | | | | | | | | | | | | | | | | | * commit 'c19a49e565bd06ea47947d50779ba236df9d4943': ppc: Support little endian intreadwrite Conflicts: libavutil/ppc/intreadwrite.h See: d37c620c84e28400ad071d1c75cc81445b4acb29 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ppc: Support little endian intreadwriteLuca Barbato2014-09-031-24/+40
| |
* | avformat/mpegts: Change order of structs to match ↵Michael Niedermayer2014-09-031-19/+19
| | | | | | | | | | | | 7968059e5c3cd8f91407f379c11bbf71a1b84c74 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74'Michael Niedermayer2014-09-031-5/+13
|\| | | | | | | | | | | | | | | | | | | * commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74': mpegts: Allow custom max resync size Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Allow custom max resync sizeLuca Barbato2014-09-031-2/+22
| |
* | Merge commit '94f084324e648876508bed546d950762f10b875e'Michael Niedermayer2014-09-031-3/+3
|\| | | | | | | | | | | | | | | | | | | | | * commit '94f084324e648876508bed546d950762f10b875e': texi2pod: Make it output a single encoding string Conflicts: doc/texi2pod.pl See: 12ce58bebdff6bfae9c56dc785e3003968f93277 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * texi2pod: Make it output a single encoding stringLuca Barbato2014-09-031-2/+3
| | | | | | | | | | Intermixing =encoding utf-8 in the file can confuse some pod2man implementations.
* | Merge commit '4912b634b517c8acfc476c5d47f10be83fe7e18b'Michael Niedermayer2014-09-031-0/+6
|\| | | | | | | | | | | | | * commit '4912b634b517c8acfc476c5d47f10be83fe7e18b': x265: Use the encoder defaults Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x265: Use the encoder defaultsLuca Barbato2014-09-031-0/+6
| | | | | | | | Reset the settings as it is done for x264.
* | avcodec/idctdsp: Initialize ff_put/add_pixels_clamped correctly so that the ↵Michael Niedermayer2014-09-031-3/+3
| | | | | | | | | | | | optimized functions are also used Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg4videodec: fix automatic use of the xvid idct on non x86Michael Niedermayer2014-09-031-4/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'eda7571ea1a41c835e3a02fa9517e5bc67d7adce'Michael Niedermayer2014-09-034-359/+379
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'eda7571ea1a41c835e3a02fa9517e5bc67d7adce': wmv2: K&R formatting cosmetics Conflicts: libavcodec/wmv2.c libavcodec/wmv2dec.c libavcodec/wmv2enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wmv2: K&R formatting cosmeticsGabriel Dume2014-09-024-362/+382
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>