Michael Niedermayer
3dda0bbe42
Merge commit ' e65c776d18'
...
* commit 'e65c776d18
2014-10-17 15:34:27 +02:00
Michael Niedermayer
6cf9d02cea
Merge commit ' 324b23dde1'
...
* commit '324b23dde1
2014-10-17 15:21:40 +02:00
Michael Niedermayer
1aed82846c
avformat/m4vdec: mark as possibly containing discontinuities
...
This will be needed for the resolution change mpeg4 test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-17 12:51:49 +02:00
Uwe L. Korn
e65c776d18
rtmpproto: Add getStreamLength call to query duration
...
In (non-live) streams with no metadata, the duration of a stream can
be retrieved by calling the RTMP function getStreamLength with the
playpath. The server will return a positive duration upon the request if
the duration is known, otherwise either no response or a duration of 0
will be returned.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-17 12:07:19 +03:00
Uwe L. Korn
324b23dde1
rtmpproto: Add function to read a number response
...
Packets that contain a number as a result to a rtmp function call are
structured the same way (String, Number, Null, Number). This new method
also includes more bounds checks to better handle packets that are not
structured as expected.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-17 12:07:19 +03:00
Luca Barbato
0db6bbb24c
avformat: Make avformat_free_context handle NULL
...
Work as the other free()-like functions.
Bug-Id: CID 1087081
CC: libav-stable@libav.org
2014-10-17 09:55:46 +01:00
Benoit Fouet
8bcf425d06
avformat/id3v2: silence a warning when CONFIG_ZLIB is unset.
...
dlen is only read when CONFIG_ZLIB is set, so mark it as possibly
unused.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-16 15:54:02 +02:00
Michael Lynch
460b509a34
rtsp: Check a memory allocation
...
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-16 09:19:03 +03:00
Di Wu
0e406aba14
mpegts: add the judgement if a new program is created successfully
...
Add the judement after create a new program to avoid segment fault.
Signed-off-by: Di Wu <di1028.wu@samsung.com>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-16 04:21:21 +02:00
Michael Niedermayer
d267a0f8c1
avformat/util: Simplify av_guess_frame_rate() by using AVCodecContext.framerate
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-16 02:46:11 +02:00
Michael Niedermayer
004f1c6cf1
avformat/utils: Try to correct the codec_framerate in ff_compute_frame_duration() for the encoding case
...
No testcase where this makes a difference is known
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-16 02:46:02 +02:00
Michael Niedermayer
46f52274f3
avformat/oggparsedirac: use AVCodecContext.framerate
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-16 01:31:09 +02:00
Michael Niedermayer
917f86f479
Merge commit ' 79dd756e14'
...
* commit '79dd756e14
2014-10-16 00:02:54 +02:00
Michael Niedermayer
f09162c06b
Merge commit ' ced7238cd0'
...
* commit 'ced7238cd0
2014-10-15 23:23:53 +02:00
Michael Niedermayer
60a876fe7b
Merge commit ' 752e71e74f'
...
* commit '752e71e74f
2014-10-15 22:03:11 +02:00
Michael Niedermayer
16f9f7b881
Merge commit ' 74b0237798'
...
* commit '74b0237798
2014-10-15 21:40:13 +02:00
Michael Niedermayer
1b54e6b12b
avformat/mov: auodetect "use_mfra_for"
...
Reviewed-by: Mika Raento <mikie@iki.fi>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 20:17:23 +02:00
Michael Lynch
c69f230a3a
avformat/rtsp: check memory allocation
...
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Commit message by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 20:04:32 +02:00
Martin Storsjö
79dd756e14
rtmpproto: Fix a typo
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-15 21:00:39 +03:00
Martin Storsjö
ced7238cd0
rtpdec_hevc: Use av_realloc instead of av_malloc+memcpy
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-15 20:54:32 +03:00
Martin Storsjö
752e71e74f
rtpdec_hevc: Rename a variable for clarity
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-15 20:54:30 +03:00
Clément Bœsch
d281a87ae3
avformat/assdec: typo fix
2014-10-15 19:25:06 +02:00
Clément Bœsch
bf700a995d
avformat/assenc: support remuxing old V4 ASS form (SSA)
2014-10-15 19:24:40 +02:00
Michael Niedermayer
a9ed4f1d15
Merge commit ' e5cfc8fdad'
...
* commit 'e5cfc8fdad
2014-10-15 19:16:55 +02:00
Michael Niedermayer
6afc319eee
Merge commit ' 9b7f932ee5'
...
* commit '9b7f932ee5
2014-10-15 19:04:22 +02:00
Michael Niedermayer
a92192d2e4
avformat/utils: use av_reduce() to simplify code and avoid overflow in ff_compute_frame_duration()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 18:23:21 +02:00
Michael Niedermayer
2b37864e7f
Merge commit ' 2d6e58497e'
...
* commit '2d6e58497e
2014-10-15 18:19:58 +02:00
Vittorio Giovara
74b0237798
mov: Correctly check the color transfer characteristics range
...
Reported-by: Ruoyu <liangry@ucweb.com>
2014-10-15 14:48:40 +01:00
Martin Storsjö
e5cfc8fdad
sdp: Provide out of bound parameter sets for HEVC if extradata is set
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-15 12:12:54 +03:00
Martin Storsjö
9b7f932ee5
rtpdec_hevc: Parse out of band vps/sps/pps/sei from fmtp lines
...
These are assembled into extradata in the order vps/sps/pps/sei.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-15 12:12:02 +03:00
Anton Khirnov
2d6e58497e
lavf: switch to AVCodecContext.framerate for demuxing
2014-10-15 06:37:55 +00:00
Michael Niedermayer
676110e6d4
avformat/mxfdec: cleanup if parsing the header metadata fails
...
Fixes memleaks
Fixes: asan_static-oob_87d116_10_201.mxf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 06:08:34 +02:00
Michael Niedermayer
0834f2056c
avformat/mxfdec: Fix memleak of packages_refs
...
Fixes: asan_static-oob_87d116_10_201.mxf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 06:08:34 +02:00
Michael Niedermayer
aae4f5108d
avformat/mxfdec: Fix memleak of primer_packs
...
Fixes: asan_static-oob_87d116_10_201.mxf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 06:08:28 +02:00
Michael Niedermayer
e3b28f10bb
avformat/mxfdec: Fix termination of mxf_data_essence_container_uls
...
Fixes: asan_static-oob_87d116_10_201.mxf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 02:09:17 +02:00
Michael Niedermayer
5552594a44
Merge commit ' a74f8121d8'
...
* commit 'a74f8121d8
2014-10-14 22:24:12 +02:00
Michael Niedermayer
99c26805e9
Merge commit ' c2c22c75cf'
...
* commit 'c2c22c75cf
2014-10-14 22:03:51 +02:00
Martin Storsjö
a74f8121d8
mov: Handle tfdt atoms
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-14 13:52:32 +03:00
Martin Storsjö
c2c22c75cf
movenc: Write tfdt atoms
...
These allow getting the absolute start timestamp of a fragment
without reading preceding timestamps. This fixes sync between
tracks if starting from fragments in different streams that don't
align exactly.
This also is a prerequisite for producing DASH content.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-14 13:52:32 +03:00
Michael Niedermayer
d58fa9482e
avformat/mp3enc: use initial_padding
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-14 03:53:17 +02:00
Michael Niedermayer
4694c0bb7c
Merge commit ' eabdc2a830'
...
* commit 'eabdc2a830
2014-10-14 03:00:17 +02:00
Michael Niedermayer
40f2b16d52
avformat/utils: print more information with av_dlog() in compute_pkt_fields()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-13 23:45:52 +02:00
Anton Khirnov
eabdc2a830
lavf: use initial_padding instead of deprecated delay
2014-10-13 19:10:30 +00:00
Benoit Fouet
f87134c7a1
avformat/movenc: add support for syncframes concatenation for E-AC-3.
...
E-AC-3 samples should contain 6 audio blocks, so concatenate syncframes
in order to achieve this.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-13 19:24:06 +02:00
Michael Niedermayer
57884172e0
avformat/mov: fix mix of declaration and statement
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-13 16:12:30 +02:00
Mika Raento
a59808dd57
mov.c: allow reading fragment start dts/pts from fragmented mp4
...
This introduces a new option to the mov demuxer: -use_mfra_for
(pts|dts). When it's given and moofs and a MFRA are present, the MFRA's
TFRAs are read for fragment start times.
Unfortunately some programs that produce fragmented mp4s use the TFRA
time field for dts and some for pts. There is no realistic way to detect
which is the case, hence the responsibility is punted onto the user.
This also means that no behavioural change is enabled by default - you
must pass either dts or pts for anything to happen.
Without this change, timestamps for some discontinuous fragmented mp4 are
wrong, and cause audio/video desync and are not usable for generating
HLS.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-13 12:20:55 +02:00
Michael Niedermayer
25a4180825
Merge commit ' 76c70e33d2'
...
* commit '76c70e33d2
2014-10-13 01:27:25 +02:00
Michael Niedermayer
094b3ce835
Merge commit ' e44ee1eb8d'
...
* commit 'e44ee1eb8d
2014-10-13 01:15:20 +02:00
Michael Niedermayer
20a66868a2
Merge commit ' dad12ce452'
...
* commit 'dad12ce452
2014-10-13 01:10:13 +02:00
Michael Niedermayer
ca5a77191b
Merge commit ' dbb472cb2f'
...
* commit 'dbb472cb2f
2014-10-13 01:02:36 +02:00
