videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-08-07 01:54:17 +02:00
Code Releases Activity
66,362 Commits 36 Branches 398 Tags 224 MiB
e927682e1b
Commit Graph

66362 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
skal
406a9ccffe avfilter/vf_idet: MMX/MMXEXT/SSE2 implementation of idet's filter_line() 
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>
 2014-09-04 22:19:00 +02:00
Michael Niedermayer
53b0892005 Merge commit 'd9792b773516a560ecb99694b8ee745a50027fac' 
* commit 'd9792b773516a560ecb99694b8ee745a50027fac':
  Mark 11 release in the changelog

Conflicts:
	Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-04 20:50:01 +02:00
Michael Niedermayer
69a68d3013 Merge commit '12f0388f9cb32016ac0dacaeca631b088b29bb96' 
* commit '12f0388f9cb32016ac0dacaeca631b088b29bb96':
  Add release notes for 11.

Conflicts:
	doc/RELEASE_NOTES

Mostly not merged

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-04 20:34:40 +02:00
Michael Niedermayer
ddc6adaa28 Merge commit '4d55e9de27894ddfb337b28cd7aa6d14a12666d2' 
* commit '4d55e9de27894ddfb337b28cd7aa6d14a12666d2':
  vc1: Split bits used in libavformat into a separate header

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-04 20:09:01 +02:00
Michael Niedermayer
5a20f1885d Merge commit 'f20518568a77a6138fc74021ce56013ab72907ba' 
* commit 'f20518568a77a6138fc74021ce56013ab72907ba':
  build: Split WMA frequencies into a separate object file

Conflicts:
	configure
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-04 19:46:06 +02:00
Michael Niedermayer
91a8b933fb Merge commit '803f8992f11d1eb301672cd13c685a7b1d04c467' 
* commit '803f8992f11d1eb301672cd13c685a7b1d04c467':
  build: cosmetics: Group hwaccel OBJS declarations together

Conflicts:
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-04 19:18:08 +02:00
Michael Niedermayer
a52e74db17 Merge commit '2b8b0da09cf0dc2535de42f95110eb633f36d8c8' 
* commit '2b8b0da09cf0dc2535de42f95110eb633f36d8c8':
  fdctdsp: cosmetics: Drop one unnecessary if-block level

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-04 19:10:33 +02:00
Diego Biurrun
d9792b7735 Mark 11 release in the changelog 
Also fix some typos in the entries for the 11 release.
 2014-09-04 17:01:36 +02:00
Anton Khirnov
12f0388f9c Add release notes for 11. 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-09-04 07:14:27 -07:00
Diego Biurrun
4d55e9de27 vc1: Split bits used in libavformat into a separate header 
This reduces inter-library dependencies.
 2014-09-04 07:11:03 -07:00
Andreas Cadhalpun
c4abee734d Remove non-free tests/lena.pnm and adapt FATE tests to depend on lena.pnm in the SAMPLES directory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-04 15:21:50 +02:00
Steven Liu
03efd73082 avformat/flvdec: read the correct bits into the tag type 
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>
 2014-09-04 14:54:23 +02:00
Diego Biurrun
f20518568a build: Split WMA frequencies into a separate object file 
These are the only WMA bits shared with binkaudio. Splitting them off
reduces the binnkaudio dependency on general WMA code.
 2014-09-04 05:19:46 -07:00
Diego Biurrun
803f8992f1 build: cosmetics: Group hwaccel OBJS declarations together 2014-09-04 05:19:39 -07:00
Dmitry Volyntsev
fe8f4c71e3 libavdevice/v4l2: fix descriptors leak on error paths 
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>
 2014-09-04 13:52:44 +02:00
Michael Niedermayer
4f63d6d3b5 avdevice/x11grab: fix error handling in pixel formats 
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-04 13:42:53 +02:00
Michael Niedermayer
bb8b752553 postproc: use FFMIN/FFMAX where appropriate 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-04 03:50:46 +02:00
Timothy Gu
17ad5fbb8a Use makeinfo to generate html doc for the new website 
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>
 2014-09-04 02:34:20 +02:00
Michael Niedermayer
75a9859ac6 Merge commit 'd2a4e4b9cc9a0c2661e1c1d6f6b51babac2cec1b' 
* commit 'd2a4e4b9cc9a0c2661e1c1d6f6b51babac2cec1b':
  wma: K&R formatting cosmetics

Conflicts:
	libavcodec/wma.c
	libavcodec/wmadec.c
	libavcodec/wmaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-03 22:10:21 +02:00
Reimar Döffinger
235d401bfa vorbisenc: avoid large stack allocation. 
Code is only used during initialization, so malloc/free
should be fine to use.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-09-03 21:22:59 +02:00
Reimar Döffinger
fcfc90ed65 svq1enc: remove pointless array element. 
Not sure it was meant to be used for something at some point though.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-09-03 21:22:58 +02:00
Reimar Döffinger
6724254118 ffv1enc: reduce stack usage. 
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>
 2014-09-03 21:22:58 +02:00
Lou Logan
efaa4a8dbf doc/demuxers: document gif demuxer 
Signed-off-by: Lou Logan <lou@lrcd.com>
 2014-09-03 10:16:05 -08:00
Jörg Krause
02a2e171ad libavutil/error: fix build with musl toolchain 
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>
 2014-09-03 20:01:25 +02:00
Michael Niedermayer
d9a416fa1a Merge commit 'c487972ed0e1eaebdbe4a13cdd191e119be0b19c' 
* commit 'c487972ed0e1eaebdbe4a13cdd191e119be0b19c':
  ismindex: recover from completely empty streams

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-03 15:04:34 +02:00
Michael Niedermayer
4bc4f6f170 Merge commit '95e177eeb21f3e968aa9353bc69d1946966cc835' 
* commit '95e177eeb21f3e968aa9353bc69d1946966cc835':
  rtpdec: HEVC/H.265 support

Conflicts:
	Changelog
	libavformat/rtpdec_hevc.c
	libavformat/version.h

See: 96b2ba68c4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-03 14:56:53 +02:00
Michael Niedermayer
dc81c0a0dc Merge commit 'ebef9f5a56d7df91e010a177a80cfc8dbe394305' 
* 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>
 2014-09-03 14:24:53 +02:00
Michael Niedermayer
7509a95656 Merge commit '65e78a2e4b111627c0ebdf2c9baec95e5e21560d' 
* commit '65e78a2e4b111627c0ebdf2c9baec95e5e21560d':
  x11grab: Refactor pixel format parsing

Conflicts:
	libavdevice/x11grab.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-03 13:58:41 +02:00
Michael Niedermayer
33bf66af02 Merge commit 'bb3ead7e54fec205c595cfb8b1d8900d50d3d1cc' 
* commit 'bb3ead7e54fec205c595cfb8b1d8900d50d3d1cc':
  x11grab: Fallback to normal XImage if SHM is not supported

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-03 13:30:24 +02:00
Michael Niedermayer
34e80af860 Merge commit 'c19a49e565bd06ea47947d50779ba236df9d4943' 
* commit 'c19a49e565bd06ea47947d50779ba236df9d4943':
  ppc: Support little endian intreadwrite

Conflicts:
	libavutil/ppc/intreadwrite.h

See: d37c620c84
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-03 13:13:29 +02:00
Michael Niedermayer
e489e83466 avformat/mpegts: Change order of structs to match 7968059e5c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-03 12:54:41 +02:00
Michael Niedermayer
ee83f667af Merge commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74' 
* commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74':
  mpegts: Allow custom max resync size

Conflicts:
	libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-03 12:44:14 +02:00
Michael Niedermayer
4d13d440ee Merge commit '94f084324e648876508bed546d950762f10b875e' 
* commit '94f084324e648876508bed546d950762f10b875e':
  texi2pod: Make it output a single encoding string

Conflicts:
	doc/texi2pod.pl

See: 12ce58bebd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-03 12:24:47 +02:00
Diego Biurrun
2b8b0da09c fdctdsp: cosmetics: Drop one unnecessary if-block level 2014-09-03 03:13:56 -07:00
Michael Niedermayer
eacf42dd50 Merge commit '4912b634b517c8acfc476c5d47f10be83fe7e18b' 
* commit '4912b634b517c8acfc476c5d47f10be83fe7e18b':
  x265: Use the encoder defaults

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-03 12:10:09 +02:00
Gabriel Dume
d2a4e4b9cc wma: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-09-03 03:09:08 -07:00
Mika Raento
c487972ed0 ismindex: recover from completely empty streams 
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>
 2014-09-03 12:06:40 +03:00
Michael Niedermayer
928cb84b32 avcodec/idctdsp: Initialize ff_put/add_pixels_clamped correctly so that the optimized functions are also used 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-03 05:19:06 +02:00
Michael Niedermayer
50841da143 avcodec/mpeg4videodec: fix automatic use of the xvid idct on non x86 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-03 05:19:06 +02:00
Michael Niedermayer
feac9cbed0 Merge commit 'eda7571ea1a41c835e3a02fa9517e5bc67d7adce' 
* commit 'eda7571ea1a41c835e3a02fa9517e5bc67d7adce':
  wmv2: K&R formatting cosmetics

Conflicts:
	libavcodec/wmv2.c
	libavcodec/wmv2dec.c
	libavcodec/wmv2enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-03 04:13:37 +02:00
Michael Niedermayer
5b58d79a99 Merge commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453' 
* commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453':
  xvid: Add C IDCT

Conflicts:
	libavcodec/dct-test.c
	libavcodec/xvididct.c

See: 298b3b6c1f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-03 04:09:38 +02:00
Michael Niedermayer
5db23c07a3 Merge commit '95c0cec03acec0a80cc1c7db48f3b2355d9e767b' 
* commit '95c0cec03acec0a80cc1c7db48f3b2355d9e767b':
  idctdsp: Add global function pointers for {add|put}_pixels_clamped functions

Conflicts:
	libavcodec/arm/idctdsp_init_arm.c
	libavcodec/dct.h
	libavcodec/idctdsp.c
	libavcodec/jrevdct.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-03 03:19:40 +02:00
Thomas Volkert
95e177eeb2 rtpdec: HEVC/H.265 support 
As specified in draft-ietf-payload-rtp-h265-06.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-09-03 02:39:24 +02:00
Luca Barbato
ebef9f5a56 time: Use clock_gettime if the monotonic clock is available 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-09-03 02:38:03 +02:00
Luca Barbato
65e78a2e4b x11grab: Refactor pixel format parsing 2014-09-03 02:38:03 +02:00
Luca Barbato
bb3ead7e54 x11grab: Fallback to normal XImage if SHM is not supported 2014-09-03 02:38:03 +02:00
Luca Barbato
c19a49e565 ppc: Support little endian intreadwrite 2014-09-03 02:38:03 +02:00
Luca Barbato
7968059e5c mpegts: Allow custom max resync size 2014-09-03 02:38:03 +02:00
Luca Barbato
94f084324e texi2pod: Make it output a single encoding string 
Intermixing =encoding utf-8 in the file can confuse some pod2man
implementations.
 2014-09-03 02:14:17 +02:00
Luca Barbato
4912b634b5 x265: Use the encoder defaults 
Reset the settings as it is done for x264.
 2014-09-03 02:14:17 +02:00