Michael Niedermayer
e821910a21
Merge commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499'
...
* commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499':
lavf: Add DSS demuxer
Conflicts:
libavformat/Makefile
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19 21:44:58 +01:00
Oleksij Rempel
062cd5a975
lavf: Add DSS demuxer
...
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-02-19 12:05:19 -05:00
Kevin Wheatley
fb3fb1d0d4
avformat/mov: Add simple ACLR atom reading to set the color range of the incomming track for codec's like DNxHD that utilise AVID's proprietary atom.
...
On input ACLR will be used to set colour range no matter which codec
it is associated with.
No change for when it will be output.
Rework mov_read_extradata function to allow detection of truncated
atom reads by callers.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19 15:42:55 +01:00
Michael Niedermayer
9e008ed1b4
avformat/movenc: Fix use of uninitialized variable (ret)
...
Fixed CID1270823
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-18 16:33:15 +01:00
Michael Niedermayer
b68d902b6e
avformat/ffmenc: Use av_freep() to avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-18 14:31:11 +01:00
Michael Niedermayer
c8c10a5fc7
avformat/ffmenc: Fix memleak of buf
...
Fixes CID1257015
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-18 14:30:15 +01:00
Michael Niedermayer
77ae94727f
Merge commit '195942ed9b9b563ec86d34b73aa2c1ee8715d59d'
...
* commit '195942ed9b9b563ec86d34b73aa2c1ee8715d59d':
riff: Support QT RLE Animation in avi ('rle ' FourCC)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 23:51:39 +01:00
Michael Niedermayer
97bd0e2a93
Merge commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4'
...
* commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4':
riff: Support ProRes in avi (APCH fourcc)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 23:42:54 +01:00
Michael Niedermayer
95165f7c1b
avformat/movenc: Fix stts_entries allocation check
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 21:51:35 +01:00
Michael Niedermayer
80c5dc5610
Merge commit 'a8765852158ecb2ae34895fa35ff51dc95c186f9'
...
* commit 'a8765852158ecb2ae34895fa35ff51dc95c186f9':
movenc: Check memory allocations
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 21:50:08 +01:00
Michael Niedermayer
575ed4fe37
Merge commit 'da7e31a240f276836a0b90ca6c0714181b353cc4'
...
* commit 'da7e31a240f276836a0b90ca6c0714181b353cc4':
rmdec: Check memory allocations from ff_rm_alloc_rmstream()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 21:42:36 +01:00
Michael Niedermayer
563ed912ea
Merge commit 'bb7701684c7170dfd5f33a3c7d827265844619f2'
...
* commit 'bb7701684c7170dfd5f33a3c7d827265844619f2':
lavf: Document the codec context initialization
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 21:26:04 +01:00
Michael Niedermayer
a4cd057bc7
avformat/matroskaenc: Use the correct data type for the chapter times
...
Fixes potential integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 20:40:00 +01:00
Michael Niedermayer
d302853bca
Merge commit '5dc47a2bd52e375ed742c45d08356b45098f458d'
...
* commit '5dc47a2bd52e375ed742c45d08356b45098f458d':
matroskaenc: Validate chapter start and end times
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 20:25:47 +01:00
Vittorio Giovara
195942ed9b
riff: Support QT RLE Animation in avi ('rle ' FourCC)
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-02-17 12:18:20 -05:00
Vittorio Giovara
c78dc12118
riff: Support ProRes in avi (APCH fourcc)
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-02-17 12:18:20 -05:00
Hugo Beauzée-Luyssen
a876585215
movenc: Check memory allocations
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-02-17 12:16:43 -05:00
Hugo Beauzée-Luyssen
da7e31a240
rmdec: Check memory allocations from ff_rm_alloc_rmstream()
...
Bug-Id: CID 1257835
2015-02-17 12:16:43 -05:00
Hugo Beauzée-Luyssen
3035d21b5a
nutdec: Check memory allocations
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-02-17 12:16:43 -05:00
Vittorio Giovara
bb7701684c
lavf: Document the codec context initialization
...
During remuxing avcodec_copy_context() is discouraged as certain fields
(such as codec_tag) could reflect invalid values between input and
output contextes.
2015-02-17 11:27:42 -05:00
Vittorio Giovara
5dc47a2bd5
matroskaenc: Validate chapter start and end times
...
CC: libav-stable@libav.org
Bug-Id: CID 1265717
2015-02-17 11:27:41 -05:00
Michael Niedermayer
527f1d22a1
avformat/tedcaptionsdec: add () to protect the argument of ERR_CODE()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 00:05:51 +01:00
Michael Niedermayer
0b638b83c6
avformat/mpc8: Add () to protect MKMPCTAG()s arguments
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 23:14:27 +01:00
Michael Niedermayer
ced26a2c65
avformat/tls: add () to protect macro arguments
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 23:09:08 +01:00
wm4
4bf3fab281
hls: fix a null pointer dereference
...
Not allocating the pls->ctx will crash in libavformat/hls.c:1410, where
it tries to dereference the field.
Sample: http://ec24.rtp.pt/liverepeater/rtpn.smil/playlist.m3u8
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 19:59:04 +01:00
Kevin Wheatley
88868d81a5
avformat/rtpdec_h264: fix compile failure with -DDEBUG
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 18:31:59 +01:00
Michael Niedermayer
38e641a060
avformat/mov: Bypass av_add_index_entry()
...
The new mov code uses a temporally non sorted index since 4abfa387b8
and can thus no longer be filled with av_add_index_entry() which expects the index to be sorted.
Reverting 4abfa387b8
and this commit would be
a alternative fix as would be various other options.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 01:30:47 +01:00
Michael Niedermayer
f9e76d66e9
Merge commit '4abfa387b8234736f6e0e541951e3d5eb60eb843'
...
* commit '4abfa387b8234736f6e0e541951e3d5eb60eb843':
mov: Change DTS-based seek into CTS-based seek.
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 01:28:02 +01:00
Michael Niedermayer
2870b86c2a
Merge commit 'e1a57cbb1c2752feb9315f748836dc44e58d2dc6'
...
* commit 'e1a57cbb1c2752feb9315f748836dc44e58d2dc6':
ape: Use the proper variable type
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15 21:43:28 +01:00
Michael Niedermayer
f3b6a8f554
Merge commit '53367b34e1156614e82ef7af888928f322566f88'
...
* commit '53367b34e1156614e82ef7af888928f322566f88':
rtp: h264: Drop the asserts
Conflicts:
libavformat/rtpdec_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15 21:20:25 +01:00
Michael Niedermayer
a848cf63dc
Merge commit '3b33dfb23c5022a0cb2a7b13878e4a3492a996c7'
...
* commit '3b33dfb23c5022a0cb2a7b13878e4a3492a996c7':
rtp: h264: Move FU-A NAL parsing to a function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15 21:09:47 +01:00
Michael Niedermayer
2d2c744f8f
Merge commit 'f0a87479960ce000f23f2beaf474707797b4b0d0'
...
* commit 'f0a87479960ce000f23f2beaf474707797b4b0d0':
rtp: h264: Move STAP-A NAL parsing to a function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15 21:03:47 +01:00
Michael Niedermayer
8f00d7f4b4
Merge commit 'a9a0b8d6c14ece1b4698c6ede9227aca980f6c5b'
...
* commit 'a9a0b8d6c14ece1b4698c6ede9227aca980f6c5b':
rtp: h264: Move parse_sprop_parameter_sets parsing to a function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15 20:57:49 +01:00
Michael Niedermayer
3773b6edea
Merge commit 'b8df0b71c525e9fc9fbee790d093bae3aa62035c'
...
* commit 'b8df0b71c525e9fc9fbee790d093bae3aa62035c':
rtp: h264: Move profile_level_id parsing to a function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15 20:49:21 +01:00
Yusuke Nakamura
4abfa387b8
mov: Change DTS-based seek into CTS-based seek.
...
CTS-based seek is reasonable since player requests frames in output order
not coded order.
This change fixes seek to a keyframe within consecutive keyframes.
Let's say P[0|-1] and P[1|0], here x and y inside [x|y] are PTS and DTS
respectively, and both two frames are a keyframe. If you try to seek on
PTS=0, i.e. P[0|-1], you'll get P[1|0] if the demuxer is DTS based. This
is obviously undesirable.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-15 21:26:04 +02:00
Michael Niedermayer
543e329a26
avformat/version: Bump version for "avformat/rtpdec: DV depacketizer (RFC 6469)"
...
Found-by: Loriker
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15 19:51:05 +01:00
Thomas Volkert
cbe508553a
avformat/rtpdec: DV depacketizer (RFC 6469)
...
Tested with live555 RTSP server
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15 19:35:19 +01:00
Luca Barbato
e1a57cbb1c
ape: Use the proper variable type
...
Avoid an unsigned underflow.
Bug-Id: 1041122
CC: libav-stable@libav.org
2015-02-15 18:20:54 +01:00
Luca Barbato
53367b34e1
rtp: h264: Drop the asserts
2015-02-15 18:20:54 +01:00
Luca Barbato
3b33dfb23c
rtp: h264: Move FU-A NAL parsing to a function
2015-02-15 18:20:54 +01:00
Luca Barbato
f0a8747996
rtp: h264: Move STAP-A NAL parsing to a function
2015-02-15 18:20:54 +01:00
Luca Barbato
a9a0b8d6c1
rtp: h264: Move parse_sprop_parameter_sets parsing to a function
2015-02-15 18:20:54 +01:00
Luca Barbato
b8df0b71c5
rtp: h264: Move profile_level_id parsing to a function
2015-02-15 18:20:54 +01:00
Federico Tomassetti
b4cda0a999
ogg: check memory allocations
...
Bug-Id: CID 1257795
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-02-15 18:20:54 +01:00
Thomas Volkert
e4a6486c17
rtpdec: experimental VP9 depacketizer (draft 0)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15 14:54:45 +01:00
Michael Niedermayer
7d60baa8d9
avformat/matroskaenc: add allow_raw_vfw and disable it by default
...
Based on complaint by wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15 00:43:38 +01:00
Michael Niedermayer
a0fe1a25fa
Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'
...
* commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e':
avformat: Don't anonymously typedef structs
Conflicts:
libavformat/adtsenc.c
libavformat/aiffenc.c
libavformat/avidec.c
libavformat/gif.c
libavformat/iff.c
libavformat/img2dec.c
libavformat/jvdec.c
libavformat/matroskadec.c
libavformat/udp.c
libavformat/wtvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14 21:07:40 +01:00
Clément Bœsch
5f9986f597
avformat/gif: use first packet palette as global for PAL8
...
This will allow the payload in PAL8 packets to not contain 768B of local
palette (which is not LZW compressed).
2015-02-14 20:48:50 +01:00
Clément Bœsch
adb9b235b6
avformat/gif: simplify gif_image_write_header() prototype
2015-02-14 20:48:50 +01:00
Gilles Chanteperdrix
3eec775b21
avformat/rtpdec_ac3: add AC3 RTP depacketization (RFC 4184)
...
Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14 20:13:52 +01:00