Michael Niedermayer
9e1cdfb89b
Merge commit ' 5c720657c2'
...
* commit '5c720657c2b71528d896
2015-06-01 00:59:44 +02:00
Michael Niedermayer
ebab902a1c
Merge commit ' bff0349d9d'
...
* commit 'bff0349d9d
2015-06-01 00:43:50 +02:00
Michael Niedermayer
348319f543
Merge commit ' a8a90906fb'
...
* commit 'a8a90906fb
2015-06-01 00:35:39 +02:00
Gilles Chanteperdrix
d61386a690
avformat/libquvi: fix error handling
...
avoid calling cleanup functions on uninitialized variables
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-31 19:04:52 +02:00
Andreas Cadhalpun
5c720657c2
mov: always check avio_read return value
...
If avio_read fails, the buffer can contain uninitialized data.
This fixes 'Conditional jump or move depends on uninitialised value(s)'
valgrind warnings, and addresses a few memleaks.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-05-31 13:05:13 +02:00
Vittorio Giovara
bff0349d9d
avio: Add avio_read wrapper to simplify error checking
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-05-31 13:05:13 +02:00
Luca Barbato
a8a90906fb
mov: Correctly allocate ctts_data
...
It can be reallocated.
CC: libav-stable@libav.org
2015-05-31 13:05:12 +02:00
Andreas Cadhalpun
cffb9ea81b
mov: reject zero bytes_per_frame with non-zero samples_per_frame
...
In this case the mov demuxer can return a large number of empty packets.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-05-31 13:05:12 +02:00
Andreas Cadhalpun
f261a55d72
mov: Fix two memleaks
...
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
CC: libav-stable@libav.org
2015-05-31 13:05:12 +02:00
Andreas Cadhalpun
8e9c39e81f
mov: abort on EOF in ff_mov_read_chan
...
Otherwise the loop can take a lot of time if num_descr is very large.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-05-31 13:05:12 +02:00
wm4
881b80b329
network: prevent SIGPIPE on OSX
...
OSX does not know MSG_NOSIGNAL. BSD (which OSX is based on) has got
the socket option SO_NOSIGPIPE (even if modern BSDs also support
MSG_NOSIGNAL).
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-05-31 10:10:16 +03:00
wm4
c41e0aedf5
network: prevent SIGPIPE on OSX
...
OSX does not know MSG_NOSIGNAL, and provides its own non-standard
mechanism instead. I guess Apple hates standards.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-30 22:29:19 +02:00
Michael Niedermayer
a3ec1d6abd
avformat/movenc: Add loction/xyz support to allow copying data between mov files
...
Fixes Ticket4337
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-30 16:44:05 +02:00
Michael Niedermayer
08b7d19def
avformat/mov: Also export loci altitude
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-30 15:28:31 +02:00
Michael Niedermayer
1607f77494
avformat/mov: Append place name instead of overwriting for loci
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-30 15:23:19 +02:00
Rodger Combs
4dd22531fd
lavf/tls_securetransport: add missing copyright notice
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-30 12:01:22 +02:00
Michael Niedermayer
aa9c6b6986
avformat/h264dec: Add ff_tlog() with trace information about h264 probing
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-30 03:57:20 +02:00
Michael Niedermayer
dae89802a6
avformat/h264dec: Fix detection of invalid h264 with 0x100 startcodes
...
Fies Ticket4325
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-30 03:53:32 +02:00
Michael Niedermayer
2e15f07cfd
Merge commit ' b2f0f37d24'
...
* commit 'b2f0f37d24
2015-05-30 00:59:57 +02:00
Martin Storsjö
b2f0f37d24
rtmpdh: Generate the whole private exponent using av_get_random_seed() with nettle/gmp
...
Don't use a PRNG for generating it; that defies the intended use
within the cryptograhic handshake.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-05-29 23:33:03 +03:00
Rodger Combs
f24d92bada
lavf/tls: Support Secure Transport
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-29 21:52:27 +02:00
Andreas Cadhalpun
153639cb9c
mov: fix DTS calculation for samples with negative stts duration
...
A negative sample duration is invalid according to the spec, but there
are samples that use it for the DTS calculation, e.g.:
http://files.1f0.de/samples/mp4-negative-stts-problem.mp4
These currently get out of A/V sync.
Also change the logging type to AV_LOG_WARNING, because decoding the
sample can continue.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-05-29 19:35:58 +02:00
Michael Niedermayer
061a592b9c
avformat/movenc: Check that track_width_1616 fits within the available 32bit before storing it
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-29 12:54:37 +02:00
Michael Niedermayer
14bc570442
avformat/movenc: avoid floats in width/height/aspect ratio computations
...
This avoids the possibility for rounding/precision differences between platforms
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-29 12:46:58 +02:00
Michael Niedermayer
3331213e2a
avformat/concatdec: Enable auto_convert by default
...
Users have no means to find out from a failure how to make it work
or is it preferred to check and print a warning for h264 concat without auto_convert ?
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-29 12:19:47 +02:00
Michael Niedermayer
e1b0019568
avformat/mov: Avoid float usage in yuv_to_rgba()
...
This avoids the possibility for rounding/precision differences between platforms
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-29 12:16:08 +02:00
Michael Niedermayer
4b8b3efb1e
Merge commit ' e9e86d9ef6'
...
* commit 'e9e86d9ef6
2015-05-29 11:42:43 +02:00
Michael Niedermayer
42a6a38418
Merge commit ' 8016a1bd3b'
...
* commit '8016a1bd3b
2015-05-29 11:42:22 +02:00
Michael Niedermayer
48e02e258c
Merge commit ' 063f7467e4'
...
* commit '063f7467e4
2015-05-29 11:38:37 +02:00
Michael Niedermayer
fbeb3fa999
Merge commit ' 0508faaa11'
...
* commit '0508faaa11
2015-05-29 11:32:07 +02:00
Michael Niedermayer
beecbe13a2
Merge commit ' 9f1b3050d9'
...
* commit '9f1b3050d9
2015-05-29 11:31:43 +02:00
Michael Niedermayer
4c0b30b07a
Merge commit ' 127d813bcb'
...
* commit '127d813bcb
2015-05-29 11:31:26 +02:00
Michael Niedermayer
392832fc3a
Merge commit ' 78efc69e7c'
...
* commit '78efc69e7c
2015-05-29 11:21:35 +02:00
Martin Storsjö
e9e86d9ef6
rtmpdh: Create sufficiently long private keys for gcrypt/nettle
...
There was a misunderstanding betewen bits and bytes for the parameter
value for generating random big numbers.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-05-29 09:42:41 +03:00
Martin Storsjö
8016a1bd3b
rtmpdh: Remove an unnecessary check in the gcrypt/nettle dh_compute_key
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-05-29 09:42:38 +03:00
Martin Storsjö
063f7467e4
rtmpdh: Add fate test for the DH handshake routine
...
This helps if these functions need to be implemented using another
crypto API.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-05-29 09:42:35 +03:00
Martin Storsjö
0508faaa11
rtmpdh: Pass the actual buffer size of the output secret key
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-05-29 09:42:32 +03:00
Martin Storsjö
9f1b3050d9
rtmpdh: Check the output buffer size in the openssl version of dh_compute_key
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-05-29 09:42:30 +03:00
Martin Storsjö
127d813bcb
rtmpdh: Fix a local variable name in the nettle/gcrypt codepath
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-05-29 09:42:28 +03:00
Martin Storsjö
78efc69e7c
rtmpdh: Make sure ret is initialized in the nettle version of bn_hex2bn
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-05-29 09:42:24 +03:00
Roman Savchenko
e85d91da48
avformat/avienc: Correct possible dereference of null
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-29 00:04:41 +02:00
Michael Niedermayer
f0b99112e3
Merge commit ' d4d90504a6'
...
* commit 'd4d90504a6
2015-05-28 21:21:07 +02:00
Michael Niedermayer
b06e82e738
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
lavc/x264: Support bgr0 as input pix_fmt.
lavf: Use av_codec_get_tag2() in avformat_query_codec().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-28 14:12:46 +02:00
Martin Storsjö
d4d90504a6
tls_gnutls: Add missing includes for the gcrypt thread safety callbacks
...
This fixes building with gcrypt-backed gnutls versions, broken
in 57cde2b180
2015-05-28 15:05:52 +03:00
Michael Niedermayer
5a3d2541bd
avformat/mxfenc: Support storing signal standard for D10 muxing
...
Reviewed-by: tim nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-28 12:36:08 +02:00
Carl Eugen Hoyos
57eecd9e4f
lavf: Use av_codec_get_tag2() in avformat_query_codec().
...
av_codec_get_tag() can return 0 both in case of error and success.
2015-05-28 12:31:40 +02:00
Timothy Gu
7206b94fb8
network: Move variable declaration under an #if
...
Avoids an unused variable warning.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-28 03:06:05 +02:00
wm4
a9f1d584e5
lavf: move TLS-related ifdeffery to library specific files
...
There is no need to have this mess in network.c.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-27 22:24:00 +02:00
wm4
4a006b9eb7
lavf: split tls.c
...
Move the OpenSSL and GnuTLS implementations to their own files. Other
than the connection code (including options) and some boilerplate, no
code is actually shared.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-27 21:48:47 +02:00
Michael Niedermayer
07fc47909f
avformat/mpsubdec: Use double instead of float for timestamp calculations
...
This provides higher precission
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-27 17:29:18 +02:00
