summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Merge commit 'a0fa6d06b848f26b16ba12f0a9a4a85b93ab8022'Hendrik Leppkes2015-12-07
|\ | | | | | | | | | | | | * commit 'a0fa6d06b848f26b16ba12f0a9a4a85b93ab8022': matroska: Warn when metadata references a non-existent element Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * matroska: Warn when metadata references a non-existent elementLuca Barbato2015-11-28
| | | | | | | | | | | | Avoid some confusion when the information is not present. Bug-Id: 902
* | Merge commit 'f7986239f4dbec91c743c4c5eb0a2339bd325bf6'Hendrik Leppkes2015-12-07
|\| | | | | | | | | | | | | * commit 'f7986239f4dbec91c743c4c5eb0a2339bd325bf6': dvenc: Validate the frame size before copying it Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dvenc: Validate the frame size before copying itLuca Barbato2015-11-28
| |
* | Remove Redundant Entry of MPEG2 Video DescAnshul Maheshwari2015-12-07
| | | | | | | | | | Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/movenc-test: correct varargs usageGanesh Ajjanagadde2015-12-06
| | | | | | | | | | | | | | | | | | | | 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>
* | avformat/rtsp: free opts dictionary on failure of getnameinfoGanesh Ajjanagadde2015-12-06
| | | | | | | | | | | | | | Fixes: CID 1341579. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | avformat/smacker: fix integer overflow with pts_incMichael Niedermayer2015-12-05
| | | | | | | | | | | | | | 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>
* | libavformat/mov.c: allow QuickTime metadata to come after traksNeil Birkbeck2015-12-05
| | | | | | | | | | | | | | 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>
* | avformat/flvdec: Fix left shift of 137 by 24 places cannot be represented in ↵Michael Niedermayer2015-12-04
| | | | | | | | | | | | | | | | | | 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>
* | avformat/msf: Check channels when reading the headerMichael Niedermayer2015-12-04
| | | | | | | | | | | | | | | | 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>
* | avformat: use AV_OPT_TYPE_BOOL in a bunch of placesClément Bœsch2015-12-04
| |
* | ffmdec: reject zero-sized chunksAndreas Cadhalpun2015-12-04
| | | | | | | | | | | | | | | | 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>
* | ffmdec: only seek back at EOF if a server is attachedAndreas Cadhalpun2015-12-04
| | | | | | | | | | | | | | | | 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>
* | avformat/oggparsetheora: Check duration to be not AV_NOPTS_VALUE (and ↵Michael Niedermayer2015-12-04
| | | | | | | | | | | | | | | | | | 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>
* | avformat/movenc: HE-AAC correct FourCC in ISMLYann Coupin2015-12-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/mpjpegdec: Fix "libavformat/mpjpegdec.c:269:9: warning: passing ↵Michael Niedermayer2015-12-04
| | | | | | | | | | | | argument 3 of av_stristart from incompatible pointer type" Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | mpegtsenc: Fix off-by-one in indexing into Opus channel mapping arraysSebastian Dröge2015-12-04
| | | | | | | | | | | | Fixes, CID1338323, CID1338324 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/utils: Fix "libavformat/utils.c:927:35: runtime error: signed ↵Michael Niedermayer2015-12-04
| | | | | | | | | | | | | | | | | | 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>
* | avformat/riffdec: remove special case for bitrate > 32bitMichael Niedermayer2015-12-03
| | | | | | | | | | | | AVCodecContext.bitrate is 64bit Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/riffdec: Initialize bitrateMichael Niedermayer2015-12-03
| | | | | | | | | | | | Fixes CID1338334 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/mpegts: use AVERROR_INVALIDDATA instead of AVERROR(EINTR).Nicolas George2015-12-03
| |
* | lavf/lxfdec: use FFERROR_REDO instead of AVERROR(EAGAIN).Nicolas George2015-12-03
| |
* | lavf/mpeg: use FFERROR_REDO instead of AVERROR(EAGAIN).Nicolas George2015-12-03
| |
* | lavf/flvdec: use FFERROR_REDO instead of AVERROR(EAGAIN).Nicolas George2015-12-03
| | | | | | | | Fix trac ticket #5041.
* | lavf: add FFERROR_REDO to let demuxers return no packet.Nicolas George2015-12-03
| |
* | mpegencts: Fix overflow in cbr mode period calculationsTimo Teräs2015-12-03
| | | | | | | | | | | | | | | | | | | | | | 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>
* | avformat/mpjpegdec: fix mixed declarations and codeJames Almer2015-12-03
| |
* | avformat/utils: Move end_time1 AV_NOPTS_VALUE Check after rescaleMichael Niedermayer2015-12-03
| | | | | | | | | | | | | | | | 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>
* | avformat/utils: Check AVFormatContext->duration in compute_chapters_end() ↵Michael Niedermayer2015-12-03
| | | | | | | | | | | | | | | | | | | | 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>
* | avformat/mpjpeg: utilize MIME boundary value to detect start of new frameAlex Agranovsky2015-12-02
| | | | | | | | | | | | 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>
* | avformat/mpjpeg: allow processing of MIME parts without Content-Length headerAlex Agranovsky2015-12-02
| | | | | | | | | | | | Fixes ticket 5023 Signed-off-by: Alex Agranovsky <alex@sighthound.com>
* | lavf/rtpenc_jpeg: Less strict check for standard Huffman tables.Carl Eugen Hoyos2015-12-02
| | | | | | | | | | | | There can be one or more Huffman table segments DHT. Reported-by: Andrey Utkin
* | avformat/matroskadec: Fix sample_aspect_ratio for stereo matroska contentAaron Colwell2015-12-02
| | | | | | | | | | | | | | | | 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>
* | avformat/mp3dec: prefer "fast_seek" to TOC seek for CBR files.Chris Cunningham2015-12-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "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>
* | avformat/dump: Fix integer overflow in av_dump_format()Michael Niedermayer2015-12-01
| | | | | | | | | | | | | | Fixes part of mozilla bug 1229167 Found-by: Tyson Smith Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/mxfdec: Set width to actual coded_width for AVCI50.Carl Eugen Hoyos2015-11-29
| | | | | | | | | | Fixes ticket #5029. Reported and analyzed by videolan trac user HenkDemper in vlc ticket #15762.
* | Merge commit '0e2395293bff089536b97131b32fea8b58bca0ba'Hendrik Leppkes2015-11-29
|\| | | | | | | | | | | | | * commit '0e2395293bff089536b97131b32fea8b58bca0ba': nut: Mark non-fatal errors as warnings Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * nut: Mark non-fatal errors as warningsLuca Barbato2015-11-25
| | | | | | | | And make one more informative.
* | Merge commit '62f72b40c0b0d2cd6a2b81977287fa01d9f4ca6d'Hendrik Leppkes2015-11-29
|\| | | | | | | | | | | | | * commit '62f72b40c0b0d2cd6a2b81977287fa01d9f4ca6d': nut: Provide more information on failure Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * nut: Provide more information on failureLuca Barbato2015-11-25
| |
* | Merge commit '2c17fb61ced2059034856a6c6cd303014aed01fe'Hendrik Leppkes2015-11-29
|\| | | | | | | | | | | | | * commit '2c17fb61ced2059034856a6c6cd303014aed01fe': rtsp: Log getaddrinfo failures Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * rtsp: Log getaddrinfo failuresLuca Barbato2015-11-25
| | | | | | | | And forward the logging contexts when needed.
* | Merge commit '12b14382861fbf19378afcddaa19cd9a949a86a3'Hendrik Leppkes2015-11-29
|\| | | | | | | | | | | | | * commit '12b14382861fbf19378afcddaa19cd9a949a86a3': udp: Provide additional information on getaddrinfo failure Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * udp: Provide additional information on getaddrinfo failureLuca Barbato2015-11-25
| |
* | Merge commit '34af7813f77e2b5b9dcb34f20bcf53bfcc0ba9c9'Hendrik Leppkes2015-11-29
|\| | | | | | | | | | | | | * commit '34af7813f77e2b5b9dcb34f20bcf53bfcc0ba9c9': udp: Use the logging context Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * udp: Use the logging contextLuca Barbato2015-11-25
| |
* | Merge commit '98063bcf15eb1e9bf9c8758c83c88d51cbb7ace7'Hendrik Leppkes2015-11-29
|\| | | | | | | | | | | | | * commit '98063bcf15eb1e9bf9c8758c83c88d51cbb7ace7': rtsp: Do not assume getnameinfo cannot fail Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * rtsp: Do not assume getnameinfo cannot failLuca Barbato2015-11-25
| | | | | | | | And properly report the error when it happens.
| * movenc-test: Fix integer overflowsMichael Niedermayer2015-11-24
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>