Michael Niedermayer
1e4e760f76
Merge commit '213e606752d16f51337e94431962fb5d7749c07e'
...
* commit '213e606752d16f51337e94431962fb5d7749c07e':
Replace av_unused attributes by block structures
Conflicts:
libavcodec/h264_loopfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05 19:24:49 +02:00
Michael Niedermayer
73aeb27cfe
Merge commit '096a1d5b46391f65dfd0bee6292e9962f53bd7c8'
...
* commit '096a1d5b46391f65dfd0bee6292e9962f53bd7c8':
rdft: Move some variables into a separate block
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05 19:16:15 +02:00
Michael Niedermayer
8c6cfffa01
Merge commit 'b574e1e97ea7067a5fcd3876e30a67df0e4e6611'
...
* commit 'b574e1e97ea7067a5fcd3876e30a67df0e4e6611':
get_bits: Add OPEN_READER macro variant w/o size_plus8
Conflicts:
libavcodec/get_bits.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05 19:08:27 +02:00
Giorgio Vazzana
7865cafec2
lavd/v4l2: simplify list_framesizes()
...
We can avoid passing file descriptor fd explicitely.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05 18:52:34 +02:00
Giorgio Vazzana
55cf7d9713
lavd/v4l2: remove unneeded variable in device_init()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05 18:43:28 +02:00
Giorgio Vazzana
3da359c140
lavd/v4l2: simplify first_field()
...
There is no need to pass fd as a second parameter. Additionally remove
unneeded curly braces.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05 18:36:04 +02:00
Giorgio Vazzana
39750b7364
lavd/v4l2: Replace s1 with ctx for consistency.
...
No functional change in the code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05 18:10:42 +02:00
Giorgio Vazzana
d247a40aad
MAINTAINERS: add myself as lavd/v4l2 maintainer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05 17:42:27 +02:00
Henrik Gramner
428aa14a48
x86inc: Make INIT_CPUFLAGS support an arbitrary number of cpuflags
...
Previously there was a limit of two cpuflags.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05 14:06:03 +02:00
Diego Biurrun
213e606752
Replace av_unused attributes by block structures
...
This is more portable and avoids warnings with compilers that do not
properly support av_unused.
2014-09-05 13:55:04 +02:00
Diego Biurrun
096a1d5b46
rdft: Move some variables into a separate block
...
This avoids an unused variable warning with hardcoded tables.
2014-09-05 13:55:03 +02:00
Diego Biurrun
b574e1e97e
get_bits: Add OPEN_READER macro variant w/o size_plus8
...
This avoids a trillion warnings from MSVC.
2014-09-05 13:55:03 +02:00
Benoit Fouet
4f10495055
tiff: fix {2,4}bpp grayscale palettes.
...
Create a default grayscale palette for 2 or 4 bpp grayscale tiff, if
there is no palette defined.
Fixes ticket #3915
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05 12:57:22 +02:00
James Darnley
db8970d7b6
vfi/x86/vf_idet: fix incorrect use of paddq
...
paddq is an SSE2 instruction so it cannot be used for MMX.
This was probably just a typo because the sums are dwords anyway.
Reviewed-by: Pascal Massimino <pascal.massimino@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05 12:49:34 +02:00
Pascal Massimino
161fc0f463
avfilter/x86/idet: fix license header (GPL -> LGPL)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05 12:22:36 +02:00
Michael Niedermayer
0940066b80
Merge commit 'b21e989a3c076d94cfdde0303724db841dd60cad'
...
* commit 'b21e989a3c076d94cfdde0303724db841dd60cad':
ismindex: produce .ismf file
Conflicts:
tools/ismindex.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05 12:14:42 +02:00
Mark Harris
ef16d12606
doc/filters.texi: fix time duration references
...
Make time duration references consistent, using @ref links, and
eliminate incorrect syntax [-]HH[:MM[:SS[.m...]]].
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2014-09-05 11:20:07 +02:00
Stefano Sabatini
6f0fc1a96b
lavf/ffmdec: return proper error code in ffm2_read_header()
...
Also log an error message in case of invalid packet size.
2014-09-05 11:20:07 +02:00
Stefano Sabatini
39b517fac0
lavc/libvpxenc: show crf CQ value in error message
2014-09-05 11:20:07 +02:00
Mika Raento
b21e989a3c
ismindex: produce .ismf file
...
This is a non-standard file that maps the MSS segment names to offsets
in the ISMV file. This can be used to build a custom MSS streaming
server without splitting the ISMV into separate files.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-09-05 09:54:55 +03:00
Michael Niedermayer
2178abd3b5
Merge commit 'd7913bf59ccbf781ce57c5d58998e8f25d10e040'
...
* commit 'd7913bf59ccbf781ce57c5d58998e8f25d10e040':
changelog: Move Ogg subtypes aliases entry to the correct release
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05 04:45:30 +02:00
James Almer
52ec81c67d
x86/hevc_res_add: add missing guards to hevc_transform_add32_8_avx2
...
Should fix compilation with old Yasm/Nasm versions.
Signed-off-by: James Almer <jamrial@gmail.com>
2014-09-04 23:34:01 -03:00
Henrik Gramner
720c21d11f
x86inc: Make ym# behave the same way as xm#
...
This makes more sense for future implementations of templates with zmm registers.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05 01:55:28 +02:00
Loren Merritt
a4dbabc8b3
x86inc: free up variable name "n" in global namespace
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05 01:41:50 +02:00
James Almer
c3d2426cca
x86/hevc_res_add: add ff_hevc_transform_add32_8_avx2
...
~20% faster than AVX.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2014-09-04 20:21:29 -03:00
Michael Niedermayer
467a55a4ee
avutil/md5: workaround clang 3.5 #20849
...
This avoids several failures on fate.ffmpeg.org, and thus makes real
bugs easier to spot
Reviewed-by: James Darnley <james.darnley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05 00:43:48 +02:00
James Darnley
46ef45ab59
lavc/x86/v210: give cpuflag to INIT macro
...
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>
2014-09-05 00:35:07 +02:00
Diego Biurrun
d7913bf59c
changelog: Move Ogg subtypes aliases entry to the correct release
2014-09-04 15:12:46 -07:00
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