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 'e9e86d9ef637f5a600c76b352ffe5a82b71b25d1'
...
* commit 'e9e86d9ef637f5a600c76b352ffe5a82b71b25d1':
rtmpdh: Create sufficiently long private keys for gcrypt/nettle
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-29 11:42:43 +02:00
Michael Niedermayer
42a6a38418
Merge commit '8016a1bd3b60e917e1b12748dd80c06c3462c286'
...
* commit '8016a1bd3b60e917e1b12748dd80c06c3462c286':
rtmpdh: Remove an unnecessary check in the gcrypt/nettle dh_compute_key
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-29 11:42:22 +02:00
Michael Niedermayer
48e02e258c
Merge commit '063f7467e4d14ab7fe01b2845dab60cc75df8b53'
...
* commit '063f7467e4d14ab7fe01b2845dab60cc75df8b53':
rtmpdh: Add fate test for the DH handshake routine
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-29 11:38:37 +02:00
Michael Niedermayer
fbeb3fa999
Merge commit '0508faaa11bf7507ffdd655aee57c9dc5a8203f4'
...
* commit '0508faaa11bf7507ffdd655aee57c9dc5a8203f4':
rtmpdh: Pass the actual buffer size of the output secret key
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-29 11:32:07 +02:00
Michael Niedermayer
beecbe13a2
Merge commit '9f1b3050d9e31e9283d818f3640f3460ac8cfb5b'
...
* commit '9f1b3050d9e31e9283d818f3640f3460ac8cfb5b':
rtmpdh: Check the output buffer size in the openssl version of dh_compute_key
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-29 11:31:43 +02:00
Michael Niedermayer
4c0b30b07a
Merge commit '127d813bcb5705202b7100cf1eccd1e26d72ba14'
...
* commit '127d813bcb5705202b7100cf1eccd1e26d72ba14':
rtmpdh: Fix a local variable name in the nettle/gcrypt codepath
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-29 11:31:26 +02:00
Michael Niedermayer
392832fc3a
Merge commit '78efc69e7c990226f4b913721ef1b308ca5bfa04'
...
* commit '78efc69e7c990226f4b913721ef1b308ca5bfa04':
rtmpdh: Make sure ret is initialized in the nettle version of bn_hex2bn
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 'd4d90504a687d2c0ef77ccf11d831f24dcff9cf1'
...
* commit 'd4d90504a687d2c0ef77ccf11d831f24dcff9cf1':
tls_gnutls: Add missing includes for the gcrypt thread safety callbacks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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
.
Signed-off-by: Martin Storsjö <martin@martin.st>
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
Michael Niedermayer
f722009ad9
avformat/mp3dec: Ensure the buffer is large enough to avoid seeks from the first frame search
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-27 17:06:24 +02:00
wm4
2b3e9bbfb5
avformat/mp3: skip junk at the beginning of mp3 files
...
Apparently it can happen that a mp3 file has junk data between id3 tag
and actual mp3 data. Skip this to avoid outputting nonsense timestamps.
(Two packets had the same timestamps, because the mp3 parser failed to
compute a frame duration.)
In this case, the junk consisted of 1044 bytes of zero, which
incidentally is the same size as normal mp3 frames in this stream. I
suspect the mp3 was edited with some tool which wiped the Xing/LAME
headers. Data near the end of the file suggests it was encoded with
"LAME3.97", but the normal Xing/LAME headers are missing. So this could
be "normal". mpg123 also attempts to skip at least 64KB of junk data by
scanning for headers.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-27 15:50:04 +02:00
Michael Niedermayer
2ae0396814
avformat/mpsubdec: change multipler to int, it only stores 1 and 100
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-27 15:24:34 +02:00
Michael Niedermayer
023040ed0d
avformat/movenc: Allow muxing mp3 with samplerate < 16khz if the user sets strict to -1
...
Fixes Ticket4267
Approved-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-27 01:47:59 +02:00
wm4
57cde2b180
lavf: move TLS-related ifdeffery to library specific files
...
There is no need to have this mess in network.c.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-05-26 21:48:51 +03:00
wm4
d8ffb2055f
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: Martin Storsjö <martin@martin.st>
2015-05-26 21:48:32 +03:00
Michael Niedermayer
cf86fd0069
avformat/matroskaenc: Avoid floats in default duration calculation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-26 20:42:05 +02:00
Michael Niedermayer
8aa9853093
avformat/ircamenc: Avoid floats
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-26 19:54:41 +02:00
Michael Niedermayer
894d8cf418
avformat/movenc: Avoid floats & float rounding in tmcd nb_frames calculation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-26 14:51:00 +02:00
Michael Niedermayer
f902b0b2cb
avformat/asfdec: Avoid float usage in duration calculation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-26 13:51:29 +02:00
Michael Niedermayer
db07fc2020
avformat/mpegts: Avoid float in bitrate calculation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-26 12:02:44 +02:00
Carl Eugen Hoyos
5193407cf6
lavf/dnxhd: Autodetect more files that can be decoded.
2015-05-26 00:29:36 +02:00
Andreas Cadhalpun
83a04f8cc1
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.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-05-26 00:28:02 +02:00
Carl Eugen Hoyos
860ac0a5bb
lavf/riff: Add 0x729A as TwoCC for G.729.
...
Reported by forum user muchuan.
2015-05-25 23:39:56 +02:00
Michael Niedermayer
cf401cd12b
avformat/rmenc: Avoid floats in duration calculation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-25 13:34:43 +02:00
Michael Niedermayer
343654c288
avformat/mpegenc: Replace *0.7 by *7/10
...
This avoids another float computation, avoiding a potential source of
rounding issues
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-25 13:34:34 +02:00
Michael Niedermayer
73f7179924
avformat/mpegenc: Do not use floats for vcd_padding_bitrate
...
This reduces the risk for rounding differences.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-25 12:43:51 +02:00
Michael Niedermayer
8ce564ea28
avformat/mov: Mark avio context of decompressed atoms as seekable
...
Fixes Ticket4329
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-25 01:26:55 +02:00
Andreas Cadhalpun
b71528d896
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.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-05-24 15:08:21 +02:00
Andreas Cadhalpun
8e77f8ab4a
mov: fix two memleaks
...
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-05-24 15:08:21 +02:00
Andreas Cadhalpun
a5718863da
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>
2015-05-24 15:07:52 +02:00
Michael Niedermayer
0c3b4efc76
avformat/movenc: Remove float use from rgb_to_yuv()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-24 13:32:53 +02:00
Michael Niedermayer
28134d6a0e
avformat/swfenc: Remove another unneeded float computation
...
fewer chances for rounding differences between platforms is better
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-24 13:32:53 +02:00
Michael Niedermayer
5d4ff4a31e
avformat/swfenc: Remove unneeded floats
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-24 03:59:26 +02:00
Michael Niedermayer
17264cd281
avformat/avienc: Avoid float usage
...
reduces risk for rounding differences between platforms
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-23 23:42:51 +02:00
Michael Niedermayer
3bf57acb9c
avformat/4xm: Change fps to AVRational
...
This fixes the video timebase as well
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-23 22:36:02 +02:00
Andreas Cadhalpun
ed4932a694
nutdec: fix various memleaks on failure
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-05-23 17:42:35 +02:00
Rodger Combs
40a3e1e9c5
avformat/wavdec: Increase dts packet threshold to fix more misdetections
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-23 16:04:19 +02:00
Michael Niedermayer
9f5769437a
avformat/wavdec: Increase probe_packets limit
...
Fixes DTS detection of b2429e5ba9.dts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-23 12:07:23 +02:00
Andreas Cadhalpun
0b79a389ba
nutdec: always check the get_str return value
...
If it fails, the buffers can be (partially) uninitialized.
This fixes 'Conditional jump or move depends on uninitialised value(s)'
valgrind warnings.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-05-23 10:36:44 +02:00
Michael Niedermayer
ebb0ca3d70
avformat/nutdec: Check X in 2nd branch of index reading
...
Prevents read of uninitialized variable
Based on patch by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-23 00:23:05 +02:00
Michael Niedermayer
3b176af001
avformat/mxfenc: Add color siting element
...
Previous version Reviewed-by: tim nicholson <nichot20@yahoo.com>
Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-22 15:30:31 +02:00
Michael Niedermayer
a45cf639e6
libavformat/mux: Add ff_choose_chroma_location()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-22 15:30:31 +02:00
James Almer
29216d7fd1
tls: fix compilation when both gnutls and openssl are enabled
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-05-22 12:21:38 +03:00
James Almer
e91fbfd9cf
tls: fix compilation when both gnutls and openssl are enabled
...
Signed-off-by: James Almer <jamrial@gmail.com>
2015-05-22 00:33:33 -03:00
Michael Niedermayer
a0124b89e3
Merge commit '94599a6de3822b13c94096d764868128f388ba28'
...
* commit '94599a6de3822b13c94096d764868128f388ba28':
tls: Remove all the local polling loops
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-22 02:49:38 +02:00
Michael Niedermayer
9221e362fd
Merge commit 'd13b124eaf452b267480074b2e6946538ed03a6e'
...
* commit 'd13b124eaf452b267480074b2e6946538ed03a6e':
tls: Remove the nonblocking code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-22 02:38:11 +02:00
Michael Niedermayer
162644c833
Merge commit 'd15eec4d6bdfa3bd4c4b5b7dd2dbd699ba253d02'
...
* commit 'd15eec4d6bdfa3bd4c4b5b7dd2dbd699ba253d02':
tls: Use custom IO to read from the URLContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-22 02:28:27 +02:00
Urvang Joshi
6b56fcbd10
WebP muxer: support a packet containing animated WebP.
...
This is the 1st patch in preparation for using WebPAnimEncoder API for encoding
and muxing WebP images.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-22 00:17:53 +02:00
Martin Storsjö
94599a6de3
tls: Remove all the local polling loops
...
These aren't necessary any longer.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-05-22 00:06:11 +03:00
Martin Storsjö
d13b124eaf
tls: Remove the nonblocking code
...
Since the underlying URLContext read functions are used,
they handle interruption, without having to handle it at
this level.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-05-22 00:05:01 +03:00
Martin Storsjö
d15eec4d6b
tls: Use custom IO to read from the URLContext
...
This avoids hijacking the fd, by reading using the normal
URLContext functions instead. This allowing reading data that has
been buffered in the underlying URLContext.
This avoids using the libraries own send functions that can
cause SIGPIPE.
The fd is still used for polling the lowlevel socket, for
waiting for retries.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-05-22 00:04:32 +03:00
Zhang Rui
c886dd2f58
avformat/mov: check result of avio_seek
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-21 18:48:18 +02:00
Carl Eugen Hoyos
4fb3efd2c1
lavf/mov: Use AVCOL_SPC constants when checking color_space.
...
Suggested-by: Ronald Bultje
2015-05-21 01:04:57 +02:00
Carl Eugen Hoyos
c4f864193f
lavf/mov: Write colour matrix "6" for color_space bt470bg.
...
This matches the demuxer's behaviour.
2015-05-21 01:04:45 +02:00
Carl Eugen Hoyos
8f6b919d99
lavf/mkv: Only skip prores header if the packet is large enough.
...
Fixes a possible endless loop.
2015-05-21 00:43:38 +02:00
Andreas Cadhalpun
bb23a15df5
nutdec: abort if EOF is reached in decode_info_header/read_sm_data
...
These loops can take a lot of time if count is very large.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-05-20 20:43:54 +02:00
Andreas Cadhalpun
fa7dec8cb0
nutdec: stop skipping bytes at EOF
...
This can unnecessarily waste a lot of time.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-05-20 19:07:26 +02:00
Andreas Cadhalpun
37e679881d
nutdec: fix infinite resync loops
...
nut->last_syncpoint_pos doesn't necessarily change between resync
attempts, so find_any_startcode can return the same startcode again.
Thus remember where the last resync happened and don't try to resync
before that.
This can't be done locally in nut_read_packet, because this wouldn't
prevent infinite resync loops, where after the resync a packet is
returned and while reading a following packet the resync happens again.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-05-20 19:07:26 +02:00
Michael Niedermayer
b3496b4a33
avformat/nutdec: Fix recovery when immedeately after seeking a failure happens
...
Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-20 17:48:28 +02:00
Michael Niedermayer
6bbb2f8f4d
avformat/nutdec: Return error on EOF from get_str()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-20 17:20:58 +02:00
Michael Niedermayer
e32d832a82
avformat/mxfenc: Set horizontal chroma subsample value from pixel format if available
...
Reviewed-by: tim nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-18 10:52:40 +02:00
Michael Niedermayer
58afb3128b
avformat/mxfenc: Set the component depth from the pixel format if available
...
Reviewed-by: tim nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-18 10:49:28 +02:00
MrBoogs
4f2fcac290
avformat/hlsenc: do not append an endlist tag when the stream ends
...
Reviewed-by: Thomas Volkert <silvo@gmx.net>
2015-05-17 17:15:03 +02:00
MrBoogs
572a8292cb
avformat/hlsenc: Add hls flag for starting a playlist with a discontinuity on startup
...
Reviewed-by: Thomas Volkert <silvo@gmx.net>
2015-05-17 17:14:00 +02:00
MrBoogs
8fd01b4a79
avformat/hlsenc: Add hls flag for rounding m3u8 durations to whole numbers, problems with floats on some devices
...
Reviewed-by: Thomas Volkert <silvo@gmx.net>
2015-05-17 17:11:44 +02:00
Carl Eugen Hoyos
ee8c18387d
lavf/mpeg: Do not detect unknown audio in Hikvision streams as alaw.
2015-05-17 12:57:27 +02:00
Carl Eugen Hoyos
2acc065653
lavf/wav: Read files >4G if no smaller filesize was written.
...
Fixes second part of ticket #4543 .
2015-05-17 02:08:58 +02:00
Carl Eugen Hoyos
2608f11863
lavf/wav: Print an error if files >4G are written.
...
Additionally, don't write an incorrect shorter size for such files.
Fixes part of ticket #4543 .
2015-05-17 02:08:58 +02:00
Carl Eugen Hoyos
caa41d1e4c
lavf/mov: Tell users about the use_absolute_path option.
...
Fixes ticket #4539 .
2015-05-17 02:08:58 +02:00
Michael Niedermayer
488383afd1
avformat/avidec: add mp2 to the list of exceptions instead of generally treating dshow_block_align==1 special
...
Fixes Ticket4552
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-17 01:46:09 +02:00
Michael Niedermayer
da4ef13cb2
avformat/mux: use <0 instead of != 0 for error check of init_muxer()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-16 18:37:21 +02:00
Michael Niedermayer
50393bce31
avformat/mov: Fix parsing short loci
...
Fixes Ticket4557
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-16 14:07:15 +02:00
Michael Niedermayer
9e4f0cfc8f
avformat/mov: Print reason of loci parsing failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-16 14:06:25 +02:00
Michael Niedermayer
e6ec65d2d3
avformat/rtsp: print a debug level note if time parsing fails
...
Fixes CID733718 again
This partly reverts commit eb7ddb5066
.
2015-05-15 20:21:37 +02:00
Vignesh Venkatasubramanian
b5508f74b9
lavf/webmdashenc: fix unchecked strftime
...
Fix unchecked strftime return value. This patch fixes Coverity
CID 1295086.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-15 00:56:43 +02:00
Michael Niedermayer
88f29406b7
avformat/nutdec: Remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-14 02:23:08 +02:00
Timothy Gu
eaeb632198
nutdec: Remove unused label
...
Added in 361702660d
. Modified version that
doesn't use this label merged in 55231323b0
,
thus obsoleting this label.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-14 02:08:12 +02:00
Michael Niedermayer
e5397513b9
Merge commit '8fc11abe1fea4f211cc7dbd58a173d1221627d90'
...
* commit '8fc11abe1fea4f211cc7dbd58a173d1221627d90':
mkv: Print unsupported mov tags when found
Conflicts:
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-13 22:04:02 +02:00
Andreas Cadhalpun
cb7c4f73e5
cafdec: free extradata before allocating it
...
This fixes a memleak if read_kuki_chunk is executed more than once.
Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-05-13 20:11:37 +02:00
Andreas Cadhalpun
a3ede6b742
cafdec: check avio_read return value
...
If avio_read fails, the buffer can contain uninitialized values.
Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-05-13 20:09:25 +02:00
Michael Niedermayer
b62b3292d8
avformat/hevc: Check num_negative_pics and num_positive_pics
...
Fixes CID1238994
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-12 19:28:15 +02:00
Michael Niedermayer
2cddc0b19a
avformat/hevc: Check cpb_cnt_minus1
...
Fixes CID1239014
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-12 19:09:06 +02:00
Michael Niedermayer
7a27aa15ec
avformat/hls: Handle read_buffer allocation failure
...
Fixes CID1297576
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-12 19:03:18 +02:00
Michael Niedermayer
70e022cfc5
avformat/idcin: Remove redundant chunk size check
...
Fixes CID1138438
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-12 18:40:16 +02:00
Michael Niedermayer
171af59d58
avformat/matroskadec: Cleanup error handling for bz2 & zlib
...
Fixes CID703652
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-12 18:34:26 +02:00
Michael Niedermayer
56abf35151
avformat/nutdec: Fix use of uinitialized value
...
Fixes CID1041175
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-12 18:20:23 +02:00
Michael Niedermayer
a23379a0a6
avformat/rtpdec_xiph: Move pkt_len onto one side of the check
...
This is more correct
Fixes CID1271793
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-12 18:07:32 +02:00
Michael Niedermayer
aa5169935e
avformat/rtpdec_xiph: Check upper bound on len in xiph_handle_packet()
...
Larger packets are not supported and would cause problems later
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-12 18:03:55 +02:00
Michael Niedermayer
81198a6837
avformat/rtpenc_jpeg: Check remaining buffer size for SOS
...
Fixes CID1238818
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-12 17:55:40 +02:00
Vittorio Giovara
8fc11abe1f
mkv: Print unsupported mov tags when found
2015-05-12 15:28:31 +01:00
Michael Niedermayer
c3671e1d57
avformat/riffenc: Use size_t for strlen in ff_riff_write_info_tag()
...
Also dont generated corrupted output for larger than 4gb strings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-12 14:15:31 +02:00
Marton Balint
93cc5ca7ed
lavf/img2dec: add option to disable pattern matching
...
Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-12 13:32:23 +02:00
Michael Niedermayer
2ce2462ba8
Merge commit 'da5c6a97bbfe34d4b30a89e72150dd400299ddce'
...
* commit 'da5c6a97bbfe34d4b30a89e72150dd400299ddce':
riff: Add MultiScope II fourcc MSC2 as MJPEG
See: e31cdb5cc8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-12 12:17:59 +02:00
Michael Niedermayer
59db9e6949
avformat/internal: Fix warning about struct declaration
...
Moving ffio_open2_wrapper() to internal as it uses AVFormatContext
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-12 03:24:19 +02:00
Carl Eugen Hoyos
da5c6a97bb
riff: Add MultiScope II fourcc MSC2 as MJPEG
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-05-12 03:22:18 +02:00
Michael Niedermayer
62a1e0035a
avformat/mlvdec: Use AVFormatContext->open_cb()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 22:53:12 +02:00
Michael Niedermayer
a228f7d5e5
avformat/avformat: slightly more verbose documentation for open_cb()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 22:33:48 +02:00
Michael Niedermayer
77ccc9145a
avformat/mov: Use open_cb() if set
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 21:56:53 +02:00
Michael Niedermayer
541d75f9a0
avformat: add callback for opening further files
...
Previous version reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 21:55:18 +02:00
Andreas Cadhalpun
0382c94f13
id3v2: catch avio_read errors in check_tag
...
Since len is an unsigned int, the comparison is currently treated as
unsigned and thus ignores all errors from avio_read.
Thus cast len to int, which is unproblematic, because at that point len
is between 0 and 4.
This fixes 'Conditional jump or move depends on uninitialised value'
valgrind warnings in is_tag.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 20:21:48 +02:00
Michael Niedermayer
2b97cc2e5b
avformat/mov: Pass MovContext into mov_open_dref()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 18:12:24 +02:00
Michael Niedermayer
ab6dc86343
avformat/vorbiscomment: Use 64bit int for ff_vorbiscomment_length()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 15:56:16 +02:00
Michael Niedermayer
66f26b3e8e
avformat/matroskaenc: Check ff_vorbiscomment_length in put_flac_codecpriv()
...
Its currently guaranteed to be smaller but its safer to check anyway
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 15:56:16 +02:00
Michael Niedermayer
0db5b2b9f8
avformat/oggenc: Check ff_vorbiscomment_length in ogg_write_vorbiscomment()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 15:56:16 +02:00
Michael Niedermayer
40a7700b82
avformat/flacenc: Check length in flac_write_block_comment()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 15:31:55 +02:00
Michael Niedermayer
eca38864a6
avformat/vorbiscomment: Check entry length in ff_vorbiscomment_write()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 15:23:51 +02:00
Michael Niedermayer
a633928d47
avformat/subtitles: Use size_t for len
...
string length could theoretically be larger than int
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 12:42:38 +02:00
Michael Niedermayer
17b26308a2
avformat/matroskadec: Use size_t for the variable holding a strlen() value.
...
Should make no difference but is more correct
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 04:05:20 +02:00
Michael Niedermayer
95efc65129
avformat/url: Use size_t for len from strlen()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 03:50:01 +02:00
Michael Niedermayer
28b7d7a36d
Merge commit 'b8d2630c5327d2818d05c8a48be0417905d8e0fd'
...
* commit 'b8d2630c5327d2818d05c8a48be0417905d8e0fd':
dashenc: Reduce the segment duration if cutting out parts with edit lists
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 01:56:11 +02:00
James Almer
32a4177a62
dashenc: replace attribute id with contentType for the AdaptationSet element
...
id should be an integer, not a string. It is also optional, so use
contentType instead which is the proper attribute for these values.
This addresses ticket #4545 , fixing an MPD validation error.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 01:37:39 +02:00
Michael Niedermayer
1cf81a2c50
Merge commit '379e5603f4131e677ecf5ba79973dcd5603f28ea'
...
* commit '379e5603f4131e677ecf5ba79973dcd5603f28ea':
id3v2: Do not export empty APIC description
Conflicts:
libavformat/id3v2.c
See: b697b297b7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 22:51:38 +02:00
Michael Niedermayer
55231323b0
Merge commit '254f3daba4271c1918d9a7ad155b1442ef93ed29'
...
* commit '254f3daba4271c1918d9a7ad155b1442ef93ed29':
nut: Make sure to clean up on read_header failure
Conflicts:
libavformat/nutdec.c
See: 361702660d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 22:31:39 +02:00
Michael Niedermayer
73b8155b31
Merge commit '4d0ee4962be7e07cdc038a78008ef2e4e47e5f81'
...
* commit '4d0ee4962be7e07cdc038a78008ef2e4e47e5f81':
avi: Validate sample_size
Conflicts:
libavformat/avidec.c
See: ca234639ac
See: c7369f3a4b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 22:20:37 +02:00
Michael Niedermayer
8b0ceb96da
Merge commit 'b34257eefd98cb768ea2f53a390b8684d51e689a'
...
* commit 'b34257eefd98cb768ea2f53a390b8684d51e689a':
nut: Check chapter creation in decode_info_header
Conflicts:
libavformat/nutdec.c
See: 3ff1af2b0d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 22:09:48 +02:00
Martin Storsjö
b8d2630c53
dashenc: Reduce the segment duration if cutting out parts with edit lists
...
This makes sure that the time + duration of the first segment
matches the start time of the next segment for e.g. AAC audio
with encoder delay.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-05-10 22:57:21 +03:00
James Almer
ac1a1cb948
dashenc: replace attribute id with contentType for the AdaptationSet element
...
id should be an integer, not a string. It is also optional, so use
contentType instead which is the proper attribute for these values.
This fixes an MPD validation error.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-05-10 22:57:20 +03:00
Michael Niedermayer
004564c930
avformat/wavenc: Check umid length
...
Fixes potential out of array read
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 20:03:36 +02:00
Michael Niedermayer
ecb4ae7879
avformat/wavenc: fix string length variable types
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 19:52:30 +02:00
Michael Niedermayer
d66b623ad0
avformat/nutenc: Fix writing strings larger than 2gb
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 16:26:58 +02:00
Michael Niedermayer
a649f36f75
avformat/http: Mark lower_proto as const in http_listen()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 15:01:36 +02:00
Michael Niedermayer
3d65570f25
avformat/mxf: Always evaluate PRINT_KEY() arguments at compile time
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 14:39:27 +02:00
Michael Niedermayer
8b42b22222
avformat/mxf: Simplify PRINT_KEY()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 14:39:26 +02:00
Reimar Döffinger
5af621278d
avformat_alloc_context: initialize raw_packet_buffer_remaining_size.
...
This currently works for most users because
avformat_open_input sets it, but this patch fixes any
applications not using that function.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2015-05-10 08:47:53 +02:00
wm4
379e5603f4
id3v2: Do not export empty APIC description
...
APIC tags always have a description. Tag writers obviously leave it
empty if there is no description. In this case, libavformat would export
"" as title. Do not set the title instead.
2015-05-09 15:55:50 +02:00
Luca Barbato
254f3daba4
nut: Make sure to clean up on read_header failure
...
Based on Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> work.
CC: libav-stable@libav.org
2015-05-09 15:55:50 +02:00
Andreas Cadhalpun
4d0ee4962b
avi: Validate sample_size
...
And either error out or set it to 0 if it is negative.
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-05-09 15:51:31 +02:00
Andreas Cadhalpun
b34257eefd
nut: Check chapter creation in decode_info_header
...
This fixes a segmentation fault when accessing the metadata.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
CC: libav-stable@libav.org
2015-05-08 11:10:51 +02:00
wm4
b697b297b7
id3v2: do not export APIC description if empty
...
APIC tags always have a description. Tag writers obviously leave it
empty if there is no description. In this case, libavformat would export
"" as title. Do not set the title instead.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-08 01:07:13 +02:00
Carl Eugen Hoyos
2279de6eca
lavf/img2dec: Autodetect qdraw images.
2015-05-07 01:21:08 +02:00
Michael Niedermayer
3e14ed05f1
avformat/internal: always check arguments of hex_dump_debug()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 01:05:45 +02:00
Michael Niedermayer
374cf93548
avformat/asfdec: do not define print_guid() to nothing
...
This avoid potential warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 00:54:06 +02:00
Michael Niedermayer
0318013afc
Merge commit '6c8c7c246280cdcd23e4d99006b95245ae837278'
...
* commit '6c8c7c246280cdcd23e4d99006b95245ae837278':
dump: Print AVAudioServiceType side data
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-06 22:29:19 +02:00
Michael Niedermayer
ffed987a4d
Merge commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d'
...
* commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d':
lavf: Open PICT images with Quickdraw
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-06 21:05:16 +02:00