Michael Niedermayer
7e5d75d53f
Merge commit '06a1d1323bc8afd03f085ae98d9b74e431b3534e'
...
* commit '06a1d1323bc8afd03f085ae98d9b74e431b3534e':
configure: Extend the neon intrinsics check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-23 00:34:36 +02:00
Michael Niedermayer
9515d7c629
Merge commit '5be7d8597d02bcaba2de2503c0e59cf865c746dc'
...
* commit '5be7d8597d02bcaba2de2503c0e59cf865c746dc':
fft-test: Comment some #endifs
Conflicts:
libavcodec/fft-test.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-23 00:29:06 +02:00
Michael Niedermayer
9eeedf8769
Merge commit '57f1b1dcc77a93c2a5c503d4e47fe2f567cf9db5'
...
* commit '57f1b1dcc77a93c2a5c503d4e47fe2f567cf9db5':
fft-test: Drop unnecessary #ifdefs around header includes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-23 00:23:28 +02:00
Michael Niedermayer
77304cf352
avcodec: dct/rdft only support float mode, skip their contents for fixed point
2014-07-23 00:18:24 +02:00
Michael Niedermayer
005e81d6cf
Merge commit '11c7155cce50971a38e6cebd39a3ba5a54645fae'
...
* commit '11c7155cce50971a38e6cebd39a3ba5a54645fae':
dct/rdft: Add missing typedefs for context structs
Not merged, as it breaks build
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 23:02:11 +02:00
Martin Storsjö
06a1d1323b
configure: Extend the neon intrinsics check
...
Check for an instruction that causes the (very old) Apple GCC 4.2
to error out ("unrecognizable insn").
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-07-22 23:57:23 +03:00
Michael Niedermayer
1df2f7b6a8
Merge commit 'eba2233b58c2c4b468c58287d6537b2f1188a8cd'
...
* commit 'eba2233b58c2c4b468c58287d6537b2f1188a8cd':
build: Add define for SIMD extensions requiring 16-byte aligned buffers
Conflicts:
configure
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 22:32:40 +02:00
Michael Niedermayer
013172ae9f
Merge commit '67bc1ba5d75953d136bfa02ce6c0a27e9fd9dac3'
...
* commit '67bc1ba5d75953d136bfa02ce6c0a27e9fd9dac3':
libxvid: Drop PPC-specific CPU detection hack
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 22:23:26 +02:00
Michael Niedermayer
016cca4504
Merge commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532'
...
* commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532':
http: Use a constant for the supported header size
Conflicts:
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 22:02:48 +02:00
Diego Biurrun
5be7d8597d
fft-test: Comment some #endifs
2014-07-22 11:55:40 -07:00
Diego Biurrun
57f1b1dcc7
fft-test: Drop unnecessary #ifdefs around header includes
2014-07-22 11:55:40 -07:00
Diego Biurrun
11c7155cce
dct/rdft: Add missing typedefs for context structs
...
Without the typedefs there can be trouble depending on #include order.
2014-07-22 11:55:40 -07:00
Diego Biurrun
eba2233b58
build: Add define for SIMD extensions requiring 16-byte aligned buffers
2014-07-22 11:46:35 -07:00
Diego Biurrun
67bc1ba5d7
libxvid: Drop PPC-specific CPU detection hack
...
It is doubtful if the hack (still) works and Xvid had ten years to fix it.
2014-07-22 11:45:07 -07:00
Michael Niedermayer
bc15b5238f
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Autodetect big-endian tiff files.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 18:23:53 +02:00
Christophe Gisquet
ed248e7f70
hevc: wait proper position for tmvp
...
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: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 18:11:50 +02:00
Carl Eugen Hoyos
050d79b6dd
Autodetect big-endian tiff files.
2014-07-22 18:09:14 +02:00
Przemysław Sobala
c68098ba4a
avcodec/mjpegdec: add pix_fmt: 0x14121200
...
Fixes: _15801_F.jpg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 18:07:44 +02:00
Michael Niedermayer
539e72727f
avutil/opt: simplify set_string_number()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 17:38:06 +02:00
Muhammad Faiz
4852a88dfb
avutil/opt: set_string_number(): remove unneeded copy
...
also remove unused variables
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 16:58:41 +02:00
Luca Barbato
7bdd2ff682
http: Use a constant for the supported header size
2014-07-22 16:38:26 +02:00
Michael Niedermayer
ca6b33b8bd
avcodec/x86/hevcdsp_init: Fix "warning: assignment from incompatible pointer type"
2014-07-22 16:36:12 +02:00
Anton Khirnov
d7e162d46b
hevcdsp: remove an unneeded variable in the loop filter
...
beta0 and beta1 will always be the same within a CU
Signed-off-by: Mickaël Raulet <mraulet@insa-rennes.fr>
cherry picked from commit 4a23d824741a289c7d2d2f2871d1e2621b63fa1b
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 16:27:26 +02:00
Anton Khirnov
ae2f048fd7
avcodec/x86/hevc_deblock: cosmetics
...
cherry picked from commit f7843356253459e6010320292dbbc1e888a5249b
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 16:18:05 +02:00
Anton Khirnov
b435043abb
hevc: cleanups in SSE2 and SSSE3 loop filters, use fewer instructions
...
cherry picked from commit f7843356253459e6010320292dbbc1e888a5249b
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 16:17:29 +02:00
Anton Khirnov
e8581b17a8
avcodec/x86/hevc_deblock: use test instead of cmp 0
...
cherry picked from commit f7843356253459e6010320292dbbc1e888a5249b
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 16:16:05 +02:00
Anton Khirnov
dc69247de4
avcodec/x86/hevc_deblock: use of paddw instead of psllw
...
cherry picked from commit f7843356253459e6010320292dbbc1e888a5249b
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 16:14:53 +02:00
Anton Khirnov
500a0394d5
avcodec/x86/hevc_deblock: add %ifs to avoid "do nothing instructions"
...
cherry picked from commit f7843356253459e6010320292dbbc1e888a5249b
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 16:13:28 +02:00
Anton Khirnov
7a4cf67117
hevc: cleaning up SSE2 and SSSE3 deblocking filters
...
Signed-off-by: Mickaël Raulet <mraulet@insa-rennes.fr>
cherry picked from commit b432041d7d1eca38831590f13b4e5baffff8186f
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 16:00:48 +02:00
Mickaël Raulet
5f08b417b4
hevc/mvs: cosmetics
...
cherry picked from commit 9053cd92700e939cde49ab0ea3c6917be453cab7
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 15:19:19 +02:00
Mickaël Raulet
cd714afe81
hevc/mvs: more cleanups
...
cherry picked from commit c4e467e79f59453783c97bc6044082edb7a6468b
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 15:13:09 +02:00
Mickaël Raulet
3ad0460831
hevc/mvs: code cleaning
...
cherry picked from commit 74f10da013ea71a3f6b77cdff989c4574c8a5ea2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 15:05:00 +02:00
Mickaël Raulet
c4d63cd230
hevc/mvs: simplifying derive_spatial_merge_candidates function
...
cherry picked from commit 99be11cf08a5628d0bb6ac7f4958bf9dd35cda62
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 14:17:19 +02:00
Mickaël Raulet
e9bb45ba79
hevc/mvs: remove same prediction block
...
cherry picked from commit 1206262ba1ef810328cadce99d5cdc0bf9285e4d
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 14:12:00 +02:00
Mickaël Raulet
560b0253ff
hevc/mvs: simplify derive_temporal_colocated_mvs
...
cherry picked from commit def7db60966765f4687250d766b40dbcf0f7e503
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 14:11:43 +02:00
Mickaël Raulet
062b9f2cdb
fate/hevc: update with new Rext bitstreams
...
cherry picked from commit d0924959f16d42630cfd7b3b4fce9fead60a4aa8
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 13:59:00 +02:00
Mickaël Raulet
37822a566f
hevc/rext: remove warning for cross component prediction
...
cherry picked from commit fb595102593c94179502bb1967f978a1d99cc7cb
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 13:59:00 +02:00
Stefano Sabatini
44071b0d25
lavf/segment: sanitize segment end time in case last packet do not have a defined duration
...
In particular, avoids to set segments with duration set to 0
(e.g. segment with a single reference frame for which duration is
undefined).
2014-07-22 13:53:31 +02:00
Stefano Sabatini
713157484a
lavf/segment: do not allow to create segments with no key-frames
...
Fix trac ticket #3749 .
2014-07-22 13:43:06 +02:00
Mickaël Raulet
627c044f50
hevc/rext: fixing rdpcm and scaling list for Range Extension
...
-new rext bitstreams:
PERSIST_RPARAM_A_RExt_Sony_1.bit ok =
QMATRIX_A_RExt_Sony_1.bit ok =
SAO_A_RExt_MediaTek_1.bit ok =
(cherry picked from commit cdea029d452c521f8e5bcbe589f44b13a4011604)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 13:07:54 +02:00
Mickaël Raulet
fa0506e413
hevc/rext: update boundary strength for chroma deblocking filter
...
cherry picked from commit 7d05c95ac5a63d7675bf645e74b4cf1fffff4796
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 13:00:14 +02:00
Michael Niedermayer
4ec1cb2497
Merge commit '78670fbf07bd03479073d4218440de4914304680'
...
* commit '78670fbf07bd03479073d4218440de4914304680':
imgconvert: cosmetics: Reshuffle defines to reduce ifdeffery
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 12:55:11 +02:00
Michael Niedermayer
7cdb3b2b79
Merge commit '6869612f5c7d4d2f20f69a5658328a761deadb1c'
...
* commit '6869612f5c7d4d2f20f69a5658328a761deadb1c':
arm: Macroize the test for 'setend' CPU instruction support
Conflicts:
libavcodec/arm/h264dsp_init_arm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 12:46:13 +02:00
Andreas Cadhalpun
135ea609ce
libavformat/img2dec.c: Add a long_name to the piped image demuxers
...
This fixes segfaults in gst-libav1.0 compiled against FFmpeg 2.3.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 05:14:44 +02:00
Michael Niedermayer
c933f2c4cc
Merge commit '16e6652286213014c28a9c3af70435e767d28638'
...
* commit '16e6652286213014c28a9c3af70435e767d28638':
aarch64: NEON intrinsics dct_unquantize_h263.
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 03:35:29 +02:00
Michael Niedermayer
135b1a3f2c
Merge commit 'd45ebd4876ab8fc07736a644de07e1b1d11a8e5d'
...
* commit 'd45ebd4876ab8fc07736a644de07e1b1d11a8e5d':
configure: add support for neon intrinsics
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 03:06:43 +02:00
Michael Niedermayer
ab7c67905d
Merge commit '389380c27915b0505fed538cd54c035c891fabd9'
...
* commit '389380c27915b0505fed538cd54c035c891fabd9':
http: Do move the class instantiation in the conditional block
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 03:00:06 +02:00
Michael Niedermayer
e621e6cac6
Merge commit '28df1d24112c6ad0763985df2faeeb198cfbad69'
...
* commit '28df1d24112c6ad0763985df2faeeb198cfbad69':
http: Provide an option to override the HTTP method
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 02:51:35 +02:00
Michael Niedermayer
dac096cf39
Merge commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830'
...
* commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830':
build: Support executable only ldflags
Conflicts:
Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 02:45:45 +02:00
Michael Niedermayer
7f1543d46c
Merge commit 'b396bbad100a7493691d09b8dceba91e3cd28e2e'
...
* commit 'b396bbad100a7493691d09b8dceba91e3cd28e2e':
configure: Do not add extralibs to avresample .pc file
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 02:40:00 +02:00