Michael Niedermayer
48e3cd4fcd
Merge commit ' e72605f80b'
...
* commit 'e72605f80b
2015-02-24 22:42:04 +01:00
Michael Niedermayer
11fb625858
Merge commit ' 2b982e92f4'
...
* commit '2b982e92f4
2015-02-24 22:34:08 +01:00
Michael Niedermayer
4c8a556a77
Merge commit ' b7a4c319fd'
...
* commit 'b7a4c319fd
2015-02-24 22:33:49 +01:00
Michael Niedermayer
2bedcbf822
Merge commit ' b651c9139e'
...
* commit 'b651c9139e
2015-02-24 22:26:42 +01:00
Michael Niedermayer
a51b192f3b
Merge commit ' db158f0dd2'
...
* commit 'db158f0dd2
2015-02-24 22:26:15 +01:00
Michael Niedermayer
8c6651a14d
Merge commit ' 353b492d0f'
...
* commit '353b492d0f
2015-02-24 22:19:33 +01:00
Michael Niedermayer
a4f50ec9dd
Merge commit ' 0752f700d6'
...
* commit '0752f700d6
2015-02-24 22:19:06 +01:00
Michael Niedermayer
ae2a8d8742
Merge commit ' 247764a592'
...
* commit '247764a592
2015-02-24 22:12:16 +01:00
Michael Niedermayer
5d06b6e984
Merge commit ' fe414059ec'
...
* commit 'fe414059ec
2015-02-24 22:11:58 +01:00
Michael Niedermayer
eb24186b45
Merge commit ' 74d318f138'
...
* commit '74d318f138
2015-02-24 22:03:57 +01:00
Michael Niedermayer
30c863fdfa
Merge commit ' 3cd5828fc0'
...
* commit '3cd5828fc0
2015-02-24 22:03:19 +01:00
Michael Niedermayer
8c1c069371
Merge commit ' 04a1be8e28'
...
* commit '04a1be8e28af940e6cb1
2015-02-24 21:55:46 +01:00
Michael Niedermayer
c6792275f4
Merge commit ' 26524e3581'
...
* commit '26524e3581afb0e5a810
2015-02-24 21:43:13 +01:00
Kevin Wheatley
3664703780
avformat/movenc: Fix writing ACLR atoms for DNxHD
...
Using the copy codec ACLR atoms where incorrectly written
During the creation of the ACLR atom we are assuming the vos_data
contains the DNxHD header. This change makes this explicit and
ensures we don't over write the stream with the extra_data.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-24 16:54:02 +01:00
Michael Niedermayer
847daac5c0
avformat/dss: Set packet position correctly
...
pos previously was set but then overwritten
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-24 15:41:02 +01:00
Martin Storsjö
e72605f80b
rtpdec: Allow allocating and freeing the private data without explicit functions
...
This can reduce the amount of boilerplate in simple depacketizers.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24 16:23:37 +02:00
Martin Storsjö
2b982e92f4
rtpdec: Set need_parsing via a handler field
...
This avoids implementing a full function just to set this one
field.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24 16:22:41 +02:00
Martin Storsjö
b7a4c319fd
rtpdec: Allow setting the need_parsing field in RTPDynamicProtocolHandler
...
This allows getting rid of quite a bit of boilerplate in depacketizers.
The default value (initializing need_parsing to 0, aka
AVSTREAM_PARSE_NONE) is the same as it is initialized to by default
in AVStream.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24 16:22:21 +02:00
Martin Storsjö
b651c9139e
rtpdec_mpa_robust: Move .enc_name to the start of the struct
...
This makes it match the other depacketizers.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24 16:22:04 +02:00
Martin Storsjö
db158f0dd2
rtpdec: Remove unnecessary _if_needed suffixes on functions
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24 16:21:54 +02:00
Martin Storsjö
353b492d0f
rtpdec: Change enc_name to a pointer instead of a fixed-size buffer
...
This avoids allocating space for a too large buffer for all the
name strings.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24 16:21:18 +02:00
Martin Storsjö
0752f700d6
rtpdec_h264: Remove an unnecessary include
...
Nothing in this file use any network functions.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24 16:20:54 +02:00
Martin Storsjö
247764a592
rtpdec_h264: Remove unnecessary struct padding
...
There's no point in adding padding in the allocation of a depacketizer
specific context struct.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24 16:20:44 +02:00
Martin Storsjö
fe414059ec
rtpdec_amr: Use the common indentation style
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24 16:20:23 +02:00
Martin Storsjö
74d318f138
rtsp: Fix the indentation of a linewrapped statement
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24 16:20:10 +02:00
Martin Storsjö
3cd5828fc0
rtpdec: Add missing trailing commas
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24 16:20:02 +02:00
Gilles Chanteperdrix
04a1be8e28
libavformat: add T.140 RTP depacketization (RFC 4103)
...
Map this to AV_CODEC_ID_TEXT.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24 16:19:44 +02:00
Martin Storsjö
26524e3581
rtsp: Interpret the text media type as AVMEDIA_TYPE_DATA
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24 16:19:37 +02:00
Clément Bœsch
cc69ccb6d4
avformat/nutdec: fix isom and mpa build deps
...
Fixes the following link error:
nutdec.c:(.text+0x2d47): undefined reference to `ff_codec_movvideo_tags'
isom.c:(.text+0x332): undefined reference to `avpriv_mpeg4audio_get_config'
isom.c:(.text+0x39e): undefined reference to `avpriv_mpa_freq_tab'
2015-02-24 11:22:47 +01:00
Michael Niedermayer
4d1b017c38
avformat/mov: Check av_add_index_entry() return value
...
Fixes NULL pointer dereference
Fixes: signal_sigsegv_b060e0_3794_cov_1293954059_vc1-wmapro.ism
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-23 22:48:35 +01:00
Michael Niedermayer
83f18410bd
Merge commit ' cdcc370293'
...
* commit 'cdcc37029322bb5bd7a3
2015-02-23 21:43:18 +01:00
Michael Niedermayer
596f81c75b
Merge commit ' fe208ca54b'
...
* commit 'fe208ca54b
2015-02-23 21:01:44 +01:00
Michael Niedermayer
6c9537b807
avformat/hlsenc: Warn if a non file protocol is used
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-23 16:53:36 +01:00
Gilles Chanteperdrix
cdcc370293
rtsp: punch holes again after pause
...
When a client behind a NAT issues a pause command, and stay paused for a
long time, the router may stop the RTP/RTCP port redirection. Resend the
hole punching packets before each PLAY command to cause the router to
restart the port redirection in that case.
Move the existing code for sending the packets from the SETUP phase
to the PLAY phase.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-23 16:55:56 +02:00
Martin Storsjö
fe208ca54b
rtpdec_hevc: Skip 1 byte (DOND) instead of 2 (DONL) between aggregation units
...
Only the first aggregation unit has 2 bytes (DONL) prepended, if
such a field is in use.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-23 15:33:20 +02:00
Michael Niedermayer
2cf521718d
Merge commit ' 35c6ce76b1'
...
* commit '35c6ce76b1
2015-02-23 12:19:26 +01:00
Michael Niedermayer
fab8b88a5e
Merge commit ' a388e72d1a'
...
* commit 'a388e72d1a
2015-02-23 00:29:50 +01:00
Michael Niedermayer
17c52d746c
Merge commit ' e2220e734f'
...
* commit 'e2220e734f
2015-02-23 00:13:23 +01:00
Michael Niedermayer
db4a2976f6
Merge commit ' c99915f7c7'
...
* commit 'c99915f7c7cbe508553a
2015-02-22 23:54:34 +01:00
Vittorio Giovara
35c6ce76b1
Canopus HQX decoder
...
Based on work by Kostya Shishkov <kostya.shishkov@gmail.com>.
2015-02-22 22:42:27 +00:00
Martin Storsjö
a388e72d1a
rtpenc_hevc: Aggregate multiple NAL units into one RTP packet, if possible
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-22 23:27:03 +02:00
Martin Storsjö
e2220e734f
rtpenc_h264: Aggregate multiple NAL units into one RTP packet, if possible
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-22 23:26:57 +02:00
Thomas Volkert
c99915f7c7
rtpdec: DV depacketizer (RFC 6469)
...
(tested with live555 RTSP server)
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-22 23:01:55 +02:00
Michael Niedermayer
3518925a91
avformat/movenc: Check for memory allocation failures
...
Fixes CID1271049
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-22 20:20:13 +01:00
Michael Niedermayer
40adcf576f
avformat/oggdec: Check for ost allocation failure
...
Fixes CID1257798
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-22 19:21:53 +01:00
Michael Niedermayer
9b8152bf04
avformat/oggdec: Check for av_malloc() failure and forward the error code
...
Fixes CID1257805
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-22 17:53:35 +01:00
Michael Niedermayer
5683810302
avformat/rmenc: Check for av_malloc() failure
...
Fixes CID1257832
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-22 17:47:40 +01:00
Gilles Chanteperdrix
22bb5bd7a3
avformat/rtsp: punch holes again after pause
...
When a client behind a NAT issues a pause command, and stay paused for a
long time, the router may stop the RTP/RTCP port redirection. Resend the
hole punching packets after each PLAY command to cause the router to
restart the port redirection in that case.
Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-22 14:09:26 +01:00
Michael Niedermayer
20f5a17956
Merge commit ' 44dc138ed2'
...
* commit '44dc138ed2fee2cc39be
2015-02-22 01:59:44 +01:00
Michael Niedermayer
1186e7cf95
Merge commit ' 96084251e5'
...
* commit '96084251e522470510d1
2015-02-22 01:30:17 +01:00
