Michael Niedermayer
b637118086
avformat/mpegenc: change assert to av_assert0
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-26 02:16:12 +02:00
Michael Niedermayer
ddd0e23d58
avformat/mpegenc: improve field names in underflow error message
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-26 01:07:24 +02:00
Michael Niedermayer
57070d9892
Merge commit '668643b9239c70b777aea322eab411ebc960d9a0'
...
* commit '668643b9239c70b777aea322eab411ebc960d9a0':
matroskadec: check av_strdup() when setting defaults
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-25 09:39:24 +02:00
Anton Khirnov
668643b923
matroskadec: check av_strdup() when setting defaults
2013-09-24 17:11:50 +02:00
Michael Niedermayer
fb45de779c
avformat/omadec: simplify checks in nprobe()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-24 00:29:02 +02:00
Michael Niedermayer
8c766228c1
Merge commit 'f2b00a5372bfa1d82a8ab99cb8eafac8a9473494'
...
* commit 'f2b00a5372bfa1d82a8ab99cb8eafac8a9473494':
movenc: Return a proper error code for invalid combinations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 14:40:18 +02:00
Michael Niedermayer
eeeb3c8fa3
Merge commit 'f7e616959aff8706edccdae763c24c897c449f6f'
...
* commit 'f7e616959aff8706edccdae763c24c897c449f6f':
electronicarts: Check packet sizes before reading
Conflicts:
libavformat/electronicarts.c
See: fb1ea777b3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 14:27:09 +02:00
Michael Niedermayer
ef7e8efc6b
Merge commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4'
...
* commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4':
lavf: Avoid setting avg_frame_rate if delta_dts is negative
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 14:19:13 +02:00
Michael Niedermayer
341dc59053
Merge commit 'f1eac2b8a0370b908cd691086d11f51342054730'
...
* commit 'f1eac2b8a0370b908cd691086d11f51342054730':
movenc: Use keyframes as default fragmentation point in ismv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 13:09:53 +02:00
Michael Niedermayer
d4574b7608
Merge commit 'a9553bbb336a7186c62b3b14a0499c1b6ba61ebd'
...
* commit 'a9553bbb336a7186c62b3b14a0499c1b6ba61ebd':
movenc: Set all implicit flags immediately in mov_write_header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 12:24:19 +02:00
Michael Niedermayer
b189c699b9
Merge commit '187023f6b2b43966acb2449a379b4ededdc4b22e'
...
* commit '187023f6b2b43966acb2449a379b4ededdc4b22e':
movenc: Set mov->mode earlier in mov_write_header
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 12:17:10 +02:00
Michael Niedermayer
03e9506aae
Merge commit '5055035670bd1a1eaca64bd3bc71fb07de9df2c3'
...
* commit '5055035670bd1a1eaca64bd3bc71fb07de9df2c3':
tls: Do not abort on non-fatal TLS alerts with gnutls
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 12:01:53 +02:00
Michael Niedermayer
09e06cd90f
Merge commit 'c951e4b442df9dde6051634a85359eb809bf2142'
...
* commit 'c951e4b442df9dde6051634a85359eb809bf2142':
flv: Make onTextData parsing robust
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 11:56:29 +02:00
Michael Niedermayer
eaa20afa76
Merge commit 'ba77757a7efafe38924b6b423acfca8c1e1c62d6'
...
* commit 'ba77757a7efafe38924b6b423acfca8c1e1c62d6':
rtmp: Replace a magic number with a macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 11:45:38 +02:00
Michael Niedermayer
c70e647a15
Merge commit '5840473890440dbe0bd2cce530ebb3d93e187ae6'
...
* commit '5840473890440dbe0bd2cce530ebb3d93e187ae6':
rtmp: Rewrite embedded flv handling
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 11:40:15 +02:00
Michael Niedermayer
eee8cb42d0
Merge commit 'e40a0e822801d2485e4e555909d7a82713fa86a5'
...
* commit 'e40a0e822801d2485e4e555909d7a82713fa86a5':
rtmp: Refactor get_packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 11:36:06 +02:00
Michael Niedermayer
f3a02f4bc1
Merge commit '32a414f316c7f0eea877370e3f9d9f25afbf5da2'
...
* commit '32a414f316c7f0eea877370e3f9d9f25afbf5da2':
rtmp: Support AMF_DATA_TYPE_MIXEDARRAY
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 11:31:13 +02:00
Martin Storsjö
b6c7bd53f4
movenchint: Clear size and len if the realloc failed
...
Previously these were left in an inconsistent state.
Pointed out by Michael Niedermayer.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-22 21:02:52 +03:00
Martin Storsjö
f2b00a5372
movenc: Return a proper error code for invalid combinations
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-22 21:02:52 +03:00
Martin Storsjö
f7e616959a
electronicarts: Check packet sizes before reading
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-22 21:02:52 +03:00
Martin Storsjö
ce67f442be
lavf: Avoid setting avg_frame_rate if delta_dts is negative
...
This avoids setting avg_frame_rate to invalid (negative)
values.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-22 21:02:52 +03:00
Michael Niedermayer
a5cbf1991c
avformat/mov: reset extradata size when extradata gets deallocated due to realloc failure
...
This prevents the fields from becoming inconsistent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-22 16:11:02 +02:00
Martin Storsjö
f1eac2b8a0
movenc: Use keyframes as default fragmentation point in ismv
...
Fragmenting blindly to a certain duration isn't a good choice
if one should be able to switch between different qualities,
therefore default to keyframes instead.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-22 16:10:21 +03:00
Martin Storsjö
a9553bbb33
movenc: Set all implicit flags immediately in mov_write_header
...
This makes sure other sanity checks for conflicting options
can work properly, e.g. for the conflict between the faststart
flag when using the ismv mode.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-22 16:10:21 +03:00
Martin Storsjö
187023f6b2
movenc: Set mov->mode earlier in mov_write_header
...
This allows simplifying some early checks that depend on the
muxer mode.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-22 16:10:21 +03:00
Martin Storsjö
5055035670
tls: Do not abort on non-fatal TLS alerts with gnutls
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-22 16:10:21 +03:00
Michael Niedermayer
05b7a635dc
avformat/movenchint: use realloc_array() to protect against integer overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-22 15:06:22 +02:00
Michael Niedermayer
63621762ec
avformat/movenchint: only change queue size if reallocation succeeded
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-22 15:05:35 +02:00
Michael Niedermayer
091ba02cc8
avformat/movenchint: revert "Use av_reallocp() where suitable"
...
reverts movenchin part of 5626f994f2
The change left the fields in an inconsistent state
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-22 15:00:08 +02:00
Luca Barbato
c951e4b442
flv: Make onTextData parsing robust
...
Certain streaming servers do not preserve the order of the fields.
2013-09-22 01:10:17 +02:00
Luca Barbato
ba77757a7e
rtmp: Replace a magic number with a macro
...
11 is the RTMP header size.
2013-09-22 01:09:33 +02:00
Luca Barbato
5840473890
rtmp: Rewrite embedded flv handling
...
Use update_offset() as done for rtmp audio, video and notifications and
read update and write the fields instead of replacing them in the rtmp
packet and then memcpying it to the output buffer.
2013-09-22 01:09:33 +02:00
Luca Barbato
e40a0e8228
rtmp: Refactor get_packet
2013-09-22 01:09:33 +02:00
Luca Barbato
32a414f316
rtmp: Support AMF_DATA_TYPE_MIXEDARRAY
...
And fix the AMF_DATA_TYPE_ARRAY parsing while at it.
A MIXEDARRAY type, as the ARRAY, store the number of elements in
an uint32 before the list. The ARRAY is strict and does not have
an OBJECT terminator, MIXEDARRAY behaves like an OBJECT type and
a different than stated number of element can be present.
2013-09-22 01:06:42 +02:00
Michael Niedermayer
21a2b97365
avformat/hls: do not limit manifest lines to 1024 chars
...
Fixes Ticket2976
Debuged-by: jaimeMF
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21 20:59:30 +02:00
Michael Niedermayer
b8a954e46d
avformat/network: fix duplicate include
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21 16:58:58 +02:00
Michael Niedermayer
49515cb840
avformat: remove duplicate includes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21 15:36:33 +02:00
James Almer
56f17407bc
matroska: Add the CueDuration element
...
Use it only on subtitle CuePoints.
With proper demuxer/splitter support this should improve the display
of subtitles right after seeking to a given point in the stream.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21 14:33:01 +02:00
Michael Niedermayer
d0171eb8d7
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
h264dec: Add .avc file name extension
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21 11:57:19 +02:00
Michael Niedermayer
de493809f3
Merge commit '01f111bdb21b4ea6d2ff3ea919d70ae9ca451cf9'
...
* commit '01f111bdb21b4ea6d2ff3ea919d70ae9ca451cf9':
h264dec: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21 11:09:41 +02:00
Lukasz Marek
5b153f8164
lavf: add SFTP protocol via libssh
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21 03:26:54 +02:00
Michael Niedermayer
15672e832f
avformat/utils: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-20 23:19:29 +02:00
Michael Niedermayer
fcd64dcc37
avformat/avienc: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-20 22:50:06 +02:00
James Almer
39442b1a1b
matroskaenc: Add CuePoints for subtitle tracks
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-20 22:40:16 +02:00
Vittorio Giovara
944c338430
h264dec: Add .avc file name extension
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-09-20 21:08:02 +02:00
Vittorio Giovara
01f111bdb2
h264dec: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-09-20 21:06:23 +02:00
Michael Niedermayer
dda7bd13b3
Merge commit '5532ee6d7d554bb54d4374d0b69f72bc9ab9fd91'
...
* commit '5532ee6d7d554bb54d4374d0b69f72bc9ab9fd91':
rtmp: Unbreak get_packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-20 15:45:04 +02:00
Michael Niedermayer
391e272c16
Merge commit 'b97b1adb3f807e1acd00d56319ee6cb41cc727e4'
...
* commit 'b97b1adb3f807e1acd00d56319ee6cb41cc727e4':
rtmpproto: Add a comment explaining the logic in handle_notify
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-20 15:30:51 +02:00
Michael Niedermayer
f657ca0d0b
Merge commit 'd8798276b65543d921adadf63cc7f5ba2d1604af'
...
* commit 'd8798276b65543d921adadf63cc7f5ba2d1604af':
r3d: Add more input value validation
Conflicts:
libavformat/r3d.c
See: 99b1b2b1c6
See: df92ac1852
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-20 15:14:31 +02:00
Michael Niedermayer
2a930fa29e
Merge commit '3ca14aa5964ea5d11f7a15f9fff17924d6096d44'
...
* commit '3ca14aa5964ea5d11f7a15f9fff17924d6096d44':
rl2: Avoid a division by zero
See: f371396dfb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-20 14:58:07 +02:00