Michael Niedermayer
7a34b7d80f
avcodec/dca: Make ff_dca_convert_bitstream() available to libavformat, needed for dts_probe()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 22:28:35 +02:00
Michael Niedermayer
40a820d6d8
Merge commit 'ed6d9ce914d552eeda16af857da97c4b1aea1e3f'
...
* commit 'ed6d9ce914d552eeda16af857da97c4b1aea1e3f':
configure: Include the armcc build number in the compiler identification
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 20:56:05 +02:00
Michael Niedermayer
5836fe20c6
Merge commit 'cbc808d726afdf53d866264722785c1304c17390'
...
* commit 'cbc808d726afdf53d866264722785c1304c17390':
jpeg2000: enable 4 component pixel formats
See: f0358dc1d3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 20:29:09 +02:00
Christophe Gisquet
75837e9add
x86: sbrdsp/fft: reuse ps_neg constant
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 19:25:08 +02:00
Christophe Gisquet
51dd80e751
x86: diracdsp: reuse constants
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 19:25:02 +02:00
Christophe Gisquet
6622a6cff3
x86: dwt: better share constants
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 19:24:57 +02:00
Christophe Gisquet
71db2d08b1
x86: better share ff_pw_2
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 19:24:49 +02:00
Christophe Gisquet
4e128ab0b1
x86: vpx/h264/hevc/mpeg2: share constants
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 18:36:31 +02:00
Martin Storsjö
ed6d9ce914
configure: Include the armcc build number in the compiler identification
...
This tries to find the most expressive part of the output of
armcc --vsn to include, giving a compiler identification of
"ARM Compiler 5.04 update 2 (build 82)" instead of just
"ARM Compiler 5.04" for armcc 5.0.
4.x versions of armcc output the following, for "armcc --vsn":
ARM C/C++ Compiler, RVCT4.0 [Build 925]
For evaluation purposes only
Software supplied by: ARM Limited
ARM C/C++ Compiler, 4.1 [Build 894]
For evaluation purposes only
Software supplied by: ARM Limited
5.0 versions output this:
Product: ARM Compiler 5.04
Component: ARM Compiler 5.04 update 2 (build 82)
Tool: armcc [5040081]
For evaluation purposes only
Software supplied by: ARM Limited
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-08-06 19:15:59 +03:00
Michael Niedermayer
305f72aee7
avcodec: Change get_pixels() to ptrdiff_t linesize
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 15:50:54 +02:00
Michael Niedermayer
6b1df5544e
avutil/cpu: check av_parse_cpu_caps() table during cpu-test
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 14:27:45 +02:00
Michael Niedermayer
fe0157a19a
avutil/cpu: Make cpu flag names match between cpu-test and av_parse_cpu_caps() tables
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 14:27:45 +02:00
Michael Niedermayer
efc4fe9d74
avutil/cpu: add aarch64 entries to 2nd table
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 14:27:45 +02:00
Vittorio Giovara
cbc808d726
jpeg2000: enable 4 component pixel formats
...
Bug-Id: 721
CC: libav-stable@libav.org
Sample-Id: 31230.mov
2014-08-06 12:23:21 +01:00
Christophe Gisquet
6786848585
hevc_deblock: change tc type
...
The x86 asm expects int32_t so use that type.
Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 12:38:26 +02:00
Timothy Gu
9f02a2b224
transcode_aac: fix const return value
...
Fixes Trac #3613 .
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 04:01:19 +02:00
Michael Niedermayer
a32e306be3
doc/muxers: document which applications are known to need disable_chpl.
...
Thanks to: John Stebbins <stebbins@jetheaddev.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 03:59:37 +02:00
Michael Niedermayer
9101ef6757
avutil/cpu: output cpu data to stdout
...
Errors go to stderr, but the cpu stats are non error output for cputest
This fixes echoing the cpu test results
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 02:01:08 +02:00
Michael Niedermayer
a8689ba872
tests/fate/libavutil: switch cpu-test back to runecho so its results are vissible
...
(needs next commt too)
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 01:57:35 +02:00
Michael Niedermayer
6552b0558a
avutil/pixelutils: check for malloc failure
...
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 01:45:29 +02:00
Michael Niedermayer
84ac2f93ca
avutil/pixelutils: avoid on stack arrays
...
The arrays are fairly large and could cause problems on some embedded systems
also they are not endian safe as they mix 32 and 8bit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 01:27:38 +02:00
Michael Niedermayer
1b168e3bcf
avutil/cpu: fix cpu-test to work with ffmpegs cpuflags syntax
...
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 00:36:19 +02:00
Michael Niedermayer
296b01d7f9
Merge commit 'a7153444df9040bf6ae103e0bbf6104b66f974cb'
...
* commit 'a7153444df9040bf6ae103e0bbf6104b66f974cb':
huffyuvdec: check width size for yuv422p
Conflicts:
libavcodec/huffyuvdec.c
See: 6abb9a901f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 00:08:03 +02:00
Michael Niedermayer
3ce55d2e32
Merge commit '70cd3b8e659c3522eea5c16a65d14b8658894a94'
...
* commit '70cd3b8e659c3522eea5c16a65d14b8658894a94':
mmvideo: check horizontal coordinate too
See: 8d3c99e825
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 23:43:12 +02:00
Michael Niedermayer
a7153444df
huffyuvdec: check width size for yuv422p
...
Avoid out of array accesses.
CC: libav-stable@libav.org
Bug-Id: CVE-2013-0848
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-08-05 20:01:59 +00:00
Michael Niedermayer
70cd3b8e65
mmvideo: check horizontal coordinate too
...
Fixes out of array accesses.
Bug-Id: CVE-2013-3672
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-08-05 19:16:12 +00:00
Clément Bœsch
97478ef5fe
avfilter/select: fix "t" eval variable comment
2014-08-05 21:15:13 +02:00
Clément Bœsch
eaeb61c3a6
avfilter/select: remove optional avcodec dependency
2014-08-05 21:05:53 +02:00
Clément Bœsch
164b7ccf21
avfilter/mp_decimate: remove avcodec dependency
2014-08-05 21:05:52 +02:00
Clément Bœsch
def03d3439
avfilter/deshake: remove avcodec dependency
2014-08-05 21:05:52 +02:00
Clément Bœsch
f50ec59751
build: remove wrong avcodec dep in decimate
...
This was probably a mistake with mpdecimate. The decimate filter doesn't
depend on avcodec.
2014-08-05 21:05:52 +02:00
Clément Bœsch
28a2107a8d
avutil: add pixelutils API
2014-08-05 21:05:52 +02:00
Michael Niedermayer
6931d12745
Merge commit '849b9d34c7ef70b370c53e7af3940f51cbc07d0f'
...
* commit '849b9d34c7ef70b370c53e7af3940f51cbc07d0f':
wmalosslessdec: fix mclms_coeffs* array size
See: ec9578d54d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 19:41:19 +02:00
Michael Niedermayer
00d2346885
Merge commit '15201e256035a3e8f9d3d7b96fc327467e1a8ead'
...
* commit '15201e256035a3e8f9d3d7b96fc327467e1a8ead':
configure: check $as first before using $gas as GNU as
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 19:31:08 +02:00
Michael Niedermayer
0160fe454c
Merge commit 'd395895cdb2ac8c95bd488549e7f893bd4dcc248'
...
* commit 'd395895cdb2ac8c95bd488549e7f893bd4dcc248':
fate: generate tests/pixfmts.mak for all targets requiring it
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 19:10:51 +02:00
Michael Niedermayer
592a854f8c
avformat/iff: Fix "source comment"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 18:16:46 +02:00
Michael Niedermayer
2569227689
avfilter/vf_noise: make constant things const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 17:04:13 +02:00
Michael Niedermayer
849b9d34c7
wmalosslessdec: fix mclms_coeffs* array size
...
Fixes corruption of context
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Bug-Id: CVE-2014-2098
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-08-05 14:58:03 +00:00
mrskman
6f3e15af84
avfilter/avf_showwaves: New p2p mode for showwaves filter
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 14:12:35 +02:00
Michael Niedermayer
a53a107a2f
Merge commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c'
...
* commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c':
movenc: Add option to disable nero chapters
Conflicts:
doc/muxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 13:58:10 +02:00
Michael Niedermayer
2e2e6b1be5
Merge commit '2601a9447efb778930b01ac58d2cc1d02498db4e'
...
* commit '2601a9447efb778930b01ac58d2cc1d02498db4e':
mpegts: Add HEVC definitions
Conflicts:
libavformat/mpegts.h
See: b2880a3de9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 13:52:32 +02:00
Michael Niedermayer
94d4f9d405
Merge commit '89616408e38ac7257e36976723df0e23d6ee1157'
...
* commit '89616408e38ac7257e36976723df0e23d6ee1157':
mpegts: Define the section length with a constant
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 13:45:26 +02:00
Michael Niedermayer
9988899993
Merge commit '701e8b42e12ad625c64ceae2252acb1de390278c'
...
* commit '701e8b42e12ad625c64ceae2252acb1de390278c':
vc-1: Optimise parser (with special attention to ARM)
Conflicts:
libavcodec/vc1_parser.c
See: a0d7f9ec9a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 13:37:07 +02:00
Janne Grunau
15201e2560
configure: check $as first before using $gas as GNU as
...
llvm's integrated assembler supports the AArch64 asm on darwin since
August 2014. So check $as first before using gas-preprocessor.pl via
$gas. Makes the checks specific for that the architecture specific asm
needs. PPC Altivec and AArch64 needs on ':vararg' for macro arguments.
Arm needs in addition the '.altmacro' directive.
2014-08-05 13:11:50 +02:00
Michael Niedermayer
bf7ed956ff
Merge commit 'adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed'
...
* commit 'adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed':
vc-1: Add platform-specific start code search routine to VC1DSPContext.
Conflicts:
configure
libavcodec/arm/vc1dsp_init_arm.c
libavcodec/vc1dsp.c
libavcodec/vc1dsp.h
See: 9d8ecdd8ca
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 13:00:41 +02:00
Michael Niedermayer
77aafadc56
Merge commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8'
...
* commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8':
h264: Move start code search functions into separate source files.
Conflicts:
libavcodec/arm/Makefile
libavcodec/arm/h264dsp_init_arm.c
libavcodec/h264_parser.c
libavcodec/h264dsp.c
libavcodec/startcode.c
libavcodec/startcode.h
See: 270cede3f3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 12:46:10 +02:00
Janne Grunau
d395895cdb
fate: generate tests/pixfmts.mak for all targets requiring it
...
All subtargets which should run the fate-filter-pixdesc% need to
generate and include tests/pixfmts.mak. Most noteable missing target was
fate itself.
2014-08-05 12:18:59 +02:00
John Stebbins
0897d2fdc7
movenc: Add option to disable nero chapters
...
And add flag to muxer documentation.
Nero chapters break some taggers (mp3tag and iTunes).
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-08-05 11:36:08 +02:00
Femi Adeyemi-Ejeye
2601a9447e
mpegts: Add HEVC definitions
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-08-05 11:30:50 +02:00
James Almer
de417982e8
x86/vp9lpf: use fewer instructions in SPLATB_MIX
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 02:47:54 +02:00