7c1c453ce9
lavf/matroskadec: Set codec_tag also for audio codecs.
...
This was already done for "A_MS/ACM" mkv files and it is done
for mov files but was not done for A_QUICKTIME" mkv files.
2015-12-12 18:21:45 +01:00
edfc835a56
avformat/mpegtsenc: Add basic multi program support
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-11 22:27:25 +01:00
676a93f2d8
avformat: Add av_program_add_stream_index()
...
This will be used by the subsequent commit(s)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-11 22:27:25 +01:00
8dcc99dc68
diracdec: Extract version parameters
2015-12-10 21:26:35 +00:00
9553689854
diracdec: Move strides to bytes, and pointer types to uint8_t.
...
Start templating functions for move to support 10-bit
Parts of this patch were written by Rostislav Pehlivanov
2015-12-10 16:52:48 +00:00
7fd1c85e51
lavf/mpjpegdec: Fixed dereference after null check
...
Fixes Coverity CID 1341576
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-09 19:55:25 +01:00
80ceb4696a
avformat/rmdec: Fix use of uninitialized variable
...
Fixes: CID1341580
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-09 18:17:47 +01:00
8cfa912e25
avformat/flacdec: remove unused return code assignment
...
Fixes CID1271811
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-09 16:47:55 +01:00
e6971db12b
avformat/matroskaenc: Check codecdelay before use
...
Fixes CID1238790
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-09 16:18:14 +01:00
6a6cfeb2e7
Merge commit '5f3a081b42b84404a40a52c80ef7a354cf048c56'
...
* commit '5f3a081b42b84404a40a52c80ef7a354cf048c56':
avi: Spin out the logic to position to the next non-interleaved stream
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-12-08 09:41:43 +01:00
97795ba6c3
lavf/mxfdec: fix seeking before the first keyframe
...
Regression since 53f2ef2c4a#5017 .
Signed-off-by: Marton Balint <cus@passwd.hu>
2015-12-08 02:14:44 +01:00
e92aa34d7b
Merge commit 'd017ed878a45171f2f6c69fb9d76401c3c494110'
...
* commit 'd017ed878a45171f2f6c69fb9d76401c3c494110':
avi: Use the correct data type
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-12-07 15:57:02 +01:00
0ecec7449c
Merge commit 'a0fa6d06b848f26b16ba12f0a9a4a85b93ab8022'
...
* commit 'a0fa6d06b848f26b16ba12f0a9a4a85b93ab8022':
matroska: Warn when metadata references a non-existent element
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-12-07 14:51:23 +01:00
255f8966b2
Merge commit 'f7986239f4dbec91c743c4c5eb0a2339bd325bf6'
...
* commit 'f7986239f4dbec91c743c4c5eb0a2339bd325bf6':
dvenc: Validate the frame size before copying it
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-12-07 14:45:47 +01:00
162754c1e0
Remove Redundant Entry of MPEG2 Video Desc
...
Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-07 01:28:48 +01:00
f1f323b6de
avformat/movenc-test: correct varargs usage
...
It is required to call va_end for each invocation of va_start within the
same function.
Fixes: CID 1341583.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-12-06 08:11:47 -05:00
90409b6da8
avformat/rtsp: free opts dictionary on failure of getnameinfo
...
Fixes: CID 1341579.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-12-06 08:11:47 -05:00
7ed47e9729
avformat/smacker: fix integer overflow with pts_inc
...
Fixes: ce19e41f0ef1e52a23edc488faecdb58/asan_heap-oob_2504e97_4202_ffa0df1baed14022b9bfd4f8ac23d0cb.smk
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-05 13:20:03 +01:00
a16243a4aa
libavformat/mov.c: allow QuickTime metadata to come after traks
...
QuickTime metadata can come after trak data. Add indicator for which trak is being parsed (-1 if none) so that global metadata after the trak can be parsed.
Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-05 04:34:24 +01:00
ab7ff38052
avformat/flvdec: Fix left shift of 137 by 24 places cannot be represented in type int
...
Fixes: 3c857d4d90365731524716e6d051e43a/signal_sigsegv_7f4f59bcc29e_1386_20abd2c8e655cb9c75b24368e65fe3b1.flv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-04 18:54:39 +01:00
689a867413
avformat/msf: Check channels when reading the header
...
Fixes integer overflow
Fixes: 0c2625f236ced104d402b4a03c0d65c7/asan_generic_274e1ce_5990_9314e7a67c26aecf011b178ade9f217c.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-04 18:54:39 +01:00
43ecec0f03
avformat: use AV_OPT_TYPE_BOOL in a bunch of places
2015-12-04 15:43:33 +01:00
a611375db5
ffmdec: reject zero-sized chunks
...
If size is zero, avio_get_str fails, leaving the buffer uninitialized.
This causes invalid reads in av_set_options_string.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-12-04 15:20:04 +01:00
488e9a06f0
ffmdec: only seek back at EOF if a server is attached
...
Otherwise the ffm demuxer can return the same packets endlessly, if
there is no server attached.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-12-04 15:20:04 +01:00
0c1d62ab9d
avformat/oggparsetheora: Check duration to be not AV_NOPTS_VALUE (and positive) before use
...
Fixes: 1536b9b096a8f95b742bae9d3d761cc6/signal_sigsegv_294aaed_7322_4fad88a38dc8952dc20dcb60c1895758.ogg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-04 13:47:58 +01:00
d89c4846e0
avformat/movenc: HE-AAC correct FourCC in ISML
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-04 03:52:25 +01:00
9696a01f12
avformat/mpjpegdec: Fix "libavformat/mpjpegdec.c:269:9: warning: passing argument 3 of av_stristart from incompatible pointer type"
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-04 03:09:00 +01:00
eb3628d87f
mpegtsenc: Fix off-by-one in indexing into Opus channel mapping arrays
...
Fixes, CID1338323, CID1338324
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-04 02:35:20 +01:00
cafb195604
avformat/utils: Fix "libavformat/utils.c:927:35: runtime error: signed integer overflow: -2450238577049583619 - 9223090561878065151 cannot be represented in type long long"
...
Fixes Mozilla bug 1229205
Found-by: Tyson Smith
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-04 00:44:06 +01:00
4e31176e14
avformat/riffdec: remove special case for bitrate > 32bit
...
AVCodecContext.bitrate is 64bit
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-03 20:20:09 +01:00
32bf6550cb
avformat/riffdec: Initialize bitrate
...
Fixes CID1338334
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-03 20:20:09 +01:00
085ab74972
lavf/mpegts: use AVERROR_INVALIDDATA instead of AVERROR(EINTR).
2015-12-03 19:16:12 +01:00
eb2e4fb674
lavf/lxfdec: use FFERROR_REDO instead of AVERROR(EAGAIN).
2015-12-03 19:16:12 +01:00
cb14d30240
lavf/mpeg: use FFERROR_REDO instead of AVERROR(EAGAIN).
2015-12-03 19:16:12 +01:00
0bac7a436b
lavf/flvdec: use FFERROR_REDO instead of AVERROR(EAGAIN).
...
Fix trac ticket #5041 .
2015-12-03 19:16:12 +01:00
3ab1e5a48c
lavf: add FFERROR_REDO to let demuxers return no packet.
2015-12-03 19:16:12 +01:00
64f7db554e
mpegencts: Fix overflow in cbr mode period calculations
...
ts->mux_rate is int (signed 32-bit) type. The period calculations
will start to overflow when mux_rate > 5mbps. This fixes overflows
by converting first to 64-bit type.
Fixes #5044 .
Signed-off-by: Timo Teräs <timo.teras@iki.fi>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-03 17:43:30 +01:00
9ac5beaa86
avformat/mpjpegdec: fix mixed declarations and code
2015-12-03 01:39:47 -03:00
ec7a3be11e
avformat/utils: Move end_time1 AV_NOPTS_VALUE Check after rescale
...
Fixes integer overflow
Fixes: 266ee543812e934f7b4a72923a2701d4/signal_sigabrt_7ffff6ae7cc9_7322_85218d61759d461bdf7387180e8000c9.ogg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-03 00:13:27 +01:00
d872643cfe
avformat/utils: Check AVFormatContext->duration in compute_chapters_end() before use
...
Fixes integer overflow
Fixes: 266ee543812e934f7b4a72923a2701d4/signal_sigabrt_7ffff6ae7cc9_7322_85218d61759d461bdf7387180e8000c9.ogg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-03 00:13:27 +01:00
5f3a081b42
avi: Spin out the logic to position to the next non-interleaved stream
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-12-02 23:49:10 +01:00
d017ed878a
avi: Use the correct data type
...
avio_tell returns an int64_t.
2015-12-02 23:49:10 +01:00
0fc61c6ab6
avi: Validate the stream-id for DV as well
...
Avoid false positives while syncing.
Bug-Id: ffmpeg/4086
Bug-Id: 879
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-12-02 23:49:10 +01:00
259c71c199
avformat/mpjpeg: utilize MIME boundary value to detect start of new frame
...
This code is disabled by default so not to regress endpoints sending invalid MIME, but can be enabled via AVOption 'strict_mime_boundary'
Signed-off-by: Alex Agranovsky <alex@sighthound.com>
2015-12-02 22:39:27 +01:00
79103f2199
avformat/mpjpeg: allow processing of MIME parts without Content-Length header
...
Fixes ticket 5023
Signed-off-by: Alex Agranovsky <alex@sighthound.com>
2015-12-02 22:37:32 +01:00
d208acf2c8
lavf/rtpenc_jpeg: Less strict check for standard Huffman tables.
...
There can be one or more Huffman table segments DHT.
Reported-by: Andrey Utkin
2015-12-02 15:03:56 +01:00
ec83efd4d3
avformat/matroskadec: Fix sample_aspect_ratio for stereo matroska content
...
matroskaenc.c applies divisors to the display width/height when generating
stereo content. This patch adds the corresponding multipliers to matroskadec.c
so that the original sample aspect ratio can be recovered.
Signed-off-by: wm4 <nfxjfg@googlemail.com>
2015-12-02 11:09:07 +01:00
5e6ce28dab
avformat/mp3dec: prefer "fast_seek" to TOC seek for CBR files.
...
"Fast seek" uses linear interpolation to find the position of the
requested seek time. For CBR this is more direct than using the
mp3 TOC and bypassing the TOC avoids problems with TOC precision.
(see https://crbug.com/545914#c13 )
For VBR, fast seek is not precise, so continue to prefer the TOC
when available (the lesser of two evils).
Also, some re-ordering of the logic in mp3_seek to simplify and
give usetoc=1 precedence over fastseek flag.
Signed-off-by: wm4 <nfxjfg@googlemail.com>
2015-12-02 11:02:27 +01:00
8e7f452022
avformat/dump: Fix integer overflow in av_dump_format()
...
Fixes part of mozilla bug 1229167
Found-by: Tyson Smith
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-01 13:26:03 +01:00
ca5f386e75
lavf: G.723.1 muxer
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-11-30 10:58:46 -05:00
Carl Eugen Hoyos
Michael Niedermayer
Kieran Kunhya
Alex Agranovsky
Hendrik Leppkes
Marton Balint
Anshul Maheshwari
Ganesh Ajjanagadde
Neil Birkbeck
Clément Bœsch
Andreas Cadhalpun
Yann Coupin
Sebastian Dröge
Nicolas George
Timo Teräs
James Almer
Luca Barbato
Michael Niedermayer
Aaron Colwell
Chris Cunningham
Mohamed Naufal