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
Michael Niedermayer
c7168d1a22
Merge commit 'fc27e7272e6f1a7053812f8a15b1b7098de44c71'
...
* commit 'fc27e7272e6f1a7053812f8a15b1b7098de44c71':
mpegts: do not export empty language tags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 02:34:12 +02:00
Dale Curtis
70f7006eb3
avformat/mov: Pass through iTunSMPB from MOV.
...
Allows demuxing of iTunes files into adts while preserving gapless
metadata.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 02:11:48 +02:00
Dale Curtis
42f3bc4072
avformat/adtsenc: Optionally enable ID3 in ADTS.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 02:11:25 +02:00
Diego Biurrun
78670fbf07
imgconvert: cosmetics: Reshuffle defines to reduce ifdeffery
2014-07-21 15:08:01 -07:00
Ben Avison
6869612f5c
arm: Macroize the test for 'setend' CPU instruction support
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-07-21 15:08:01 -07:00
James Yu
16e6652286
aarch64: NEON intrinsics dct_unquantize_h263.
...
Intrinsics only used on aarch64 since the existing ARMv7 NEON asm
is slightly faster (Cortex-A9, gcc-4.8, micro-benchmarks and full
decoding time).
Signed-off-by: James Yu <james.yu@linaro.org>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2014-07-21 23:18:29 +02:00
Janne Grunau
d45ebd4876
configure: add support for neon intrinsics
2014-07-21 23:18:29 +02:00
Michael Niedermayer
c75c594e5a
Merge commit '4d2d0595cf9dd199c35aefef450952d209a56573'
...
* commit '4d2d0595cf9dd199c35aefef450952d209a56573':
fate: Split audio- and video-related RealMedia targets
Conflicts:
tests/fate/real.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-21 23:08:41 +02:00
Michael Niedermayer
16c66f3151
Merge commit '2ce53880bfeb431decdd2fc82298c0aff823ab47'
...
* commit '2ce53880bfeb431decdd2fc82298c0aff823ab47':
build: Conditionally compile all avcodec test programs
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-21 22:29:15 +02:00
Luca Barbato
389380c279
http: Do move the class instantiation in the conditional block
...
Remove a warning if https support is disabled.
2014-07-21 22:18:35 +02:00
Luca Barbato
28df1d2411
http: Provide an option to override the HTTP method
...
Certain servers accept only PUT as valid method.
2014-07-21 22:18:35 +02:00
Luca Barbato
bb0babd705
build: Support executable only ldflags
...
The options is useful to build position-independent executables on
hardened systems (e.g. Android L and Gentoo Hardened).
2014-07-21 22:18:35 +02:00
Luca Barbato
b396bbad10
configure: Do not add extralibs to avresample .pc file
...
The library does not have external dependencies.
2014-07-21 22:18:35 +02:00
Michael Niedermayer
9a436ae30f
Merge commit '16b7328058fa600d5158c84d9cc621a134eb88bc'
...
* commit '16b7328058fa600d5158c84d9cc621a134eb88bc':
build: Conditionally build and run DCT test program
Conflicts:
libavcodec/Makefile
libavcodec/dct-test.c
tests/fate/libavcodec.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-21 22:02:23 +02:00
Jan Gerber
fc27e7272e
mpegts: do not export empty language tags
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-07-21 19:39:31 +00:00
Michael Niedermayer
79df91bfc4
Merge commit 'bd499d9af668aef979ec9f3f3215b8dd508c7ec1'
...
* commit 'bd499d9af668aef979ec9f3f3215b8dd508c7ec1':
build: Conditionally build and test iirfilter
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-21 21:35:02 +02:00
Michael Niedermayer
94c4ad27dc
doc/APIchanges: mention FF_INPUT_BUFFER_PADDING_SIZE chage
...
Suggested-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-21 21:16:24 +02:00
Katerina Barone-Adesi
4d2d0595cf
fate: Split audio- and video-related RealMedia targets
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-07-21 12:13:58 -07:00
Michael Niedermayer
265dadbe7d
avutil/opt: Support general expressions involving AVOption constants in set_string_number()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-21 17:00:37 +02:00
Michael Niedermayer
88efc013b1
avutil: move QP2LAMBDA constant to eval
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-21 15:30:45 +02:00
Michael Niedermayer
2c5c7f1089
avutil/opt: remove dead code from set_string_number()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-21 15:28:53 +02:00
Muhammad Faiz
4927c0a988
avutil/opt.c: fix bug when parsing option
...
fix these strange behavior:
-af flanger=delay=10 [OK]
-af flanger=delay=1e1 [OK]
-af flanger=delay=1e+1 [Error]
-af flanger=delay=0.1 [OK]
-af flanger=delay=1e-1 [Error]
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-21 15:20:39 +02:00
Diego Biurrun
2ce53880bf
build: Conditionally compile all avcodec test programs
2014-07-21 05:33:03 -07:00
Diego Biurrun
16b7328058
build: Conditionally build and run DCT test program
2014-07-21 05:32:35 -07:00
Diego Biurrun
bd499d9af6
build: Conditionally build and test iirfilter
2014-07-21 05:32:07 -07:00
Michael Niedermayer
4054171666
avcodec/dct-test: remove fixed array sizes
...
They are unneeded and make adding elements slightly harder as they
would need to be constantly updated
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-21 14:00:48 +02:00
Michael Niedermayer
c05dbb8744
Merge commit 'c3ec963d0d0fac2d817f7fbce2e89ed46eeba550'
...
* commit 'c3ec963d0d0fac2d817f7fbce2e89ed46eeba550':
mjpeg: return proper error code
See: 2ebaadf35c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-21 13:54:28 +02:00
Michael Niedermayer
d986c414de
Merge commit '81b9bf319226fe03436c80aaa8a2c91767cab7ce'
...
* commit '81b9bf319226fe03436c80aaa8a2c91767cab7ce':
dct-test: Move arch-specific bits into arch-specific subdirectories
Conflicts:
libavcodec/dct-test.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-21 13:33:51 +02:00
Michael Niedermayer
5b998dae59
Merge commit 'a9f3f5fadb57bae3f3ff0be69e56b2c6014f2513'
...
* commit 'a9f3f5fadb57bae3f3ff0be69e56b2c6014f2513':
Revert "tiff: support reading gray+alpha at 8 bits"
Not merged, the pix fmt its not unknown
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-21 13:03:38 +02:00
Nidhi Makhijani
c3ec963d0d
mjpeg: return proper error code
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-07-21 01:25:33 -07:00
Diego Biurrun
81b9bf3192
dct-test: Move arch-specific bits into arch-specific subdirectories
2014-07-21 01:10:11 -07:00
Janne Grunau
a9f3f5fadb
Revert "tiff: support reading gray+alpha at 8 bits"
...
This reverts commit b31d76e45f
as it
uses an unkown pixel format.
2014-07-21 08:35:32 +02:00
Muhammad Faiz
ce385c869c
avfilter/biquads: avoid clipping when using floating type
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-21 03:48:18 +02:00
Michael Niedermayer
71e515c180
avformat/sapenc: Use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-21 03:19:12 +02:00
Michael Niedermayer
437da3e349
avfilter/vf_owdenoise: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-21 03:18:56 +02:00
Michael Niedermayer
ec59f027ac
Merge commit '819bb3e81c72939ae1c1a4e5fc3dfdf3e98df074'
...
* commit '819bb3e81c72939ae1c1a4e5fc3dfdf3e98df074':
fate: add h264-direct-bff test
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-21 02:27:28 +02:00
Michael Niedermayer
dc021a0218
Merge commit 'c39059bea3adebcd888571d1181db215eee54495'
...
* commit 'c39059bea3adebcd888571d1181db215eee54495':
h264: Fix direct temporal mvs for bottom-field-first poc order
Conflicts:
libavcodec/h264_direct.c
See: ebd1c505d2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-21 02:16:13 +02:00
Michael Niedermayer
08b597b1f8
Merge commit 'b31d76e45fc3c6529dd7109e721676f3ec376d00'
...
* commit 'b31d76e45fc3c6529dd7109e721676f3ec376d00':
tiff: support reading gray+alpha at 8 bits
See: f746f37901
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-21 02:05:22 +02:00
Michael Niedermayer
110420aac0
Merge commit '4de8b60684ce13dff3e3d372dae4f49b9e53f755'
...
* commit '4de8b60684ce13dff3e3d372dae4f49b9e53f755':
idct: Move arm-specific declarations to a header in the arm directory
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-21 01:56:22 +02:00
Vittorio Giovara
819bb3e81c
fate: add h264-direct-bff test
2014-07-20 23:32:13 +01:00
Ronald S. Bultje
c39059bea3
h264: Fix direct temporal mvs for bottom-field-first poc order
...
Such files can be created using the --bff x264 option.
Sample-Id: h264_direct_temporal_mvs_bff.mkv
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-07-20 23:32:13 +01:00
Carl Eugen Hoyos
b31d76e45f
tiff: support reading gray+alpha at 8 bits
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-07-20 23:32:13 +01:00