RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
101,265 Commits 36 Branches 392 Tags 310 MiB
Commit Graph

29 Commits

Author SHA1 Message Date
Anton Khirnov cea7c19cda lavf: move AVStream.*index_entries* to AVStreamInternal 
Those are private fields, no reason to have them exposed in a public
header. Since there are some (semi-)public fields located after these,
even though this section is supposed to be private, keep some dummy
padding there until the next major bump to preserve ABI compatibility.
 2020-10-28 14:59:28 +01:00
Andreas Rheinhardt d661cfc184 avformat/mlvdec: Only store dimensions after having validated them 
Otherwise it might happen that invalid dimensions are used when reading
a video packet; this might lead to undefined overflow.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-08-18 14:26:40 +02:00
Andreas Rheinhardt 0d560873da avformat/mlvdec: Don't leak open AVIOContexts on error 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-08-18 14:25:30 +02:00
Andreas Rheinhardt 6e0dd41fa3 avformat/mlvdec: Check for existence of AVIOContext before using it 
The mlv demuxer supports input split into multiple files; if invalid
data is encountered when parsing one of the subsequent files, that file
is closed. But at this point some index entries belonging to this file
might already have been added. In this case, the read_packet function
might try to use the AVIOContext (which is NULL) to read data which will
of course crash. This commit fixes this.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 2020-08-18 14:18:18 +02:00
Michael Niedermayer 5bd5c31087 avformat/mlvdec: fail reading a packet with 0 streams 
Fixes: NULL pointer dereference
Fixes: 22604/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5667739074297856.fuzz

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2020-06-07 22:01:12 +02:00
Steven Liu bb190ded67 avformat/mlvdec:drop unnecessary check before ff_format_io_close 
Reviewed-by: Linjie Fu <linjie.fu@intel.com>
Reviewed-by: Jun Zhao <barryjzhao@tencent.com>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
 2019-11-09 11:27:14 +09:00
Carl Eugen Hoyos 4d8875ec23 lavf: Constify the probe function argument. 
Reviewed-by: Lauri Kasanen
Reviewed-by: Tomas Härdin
 2019-03-21 11:42:17 +01:00
Michael Niedermayer 1e71cb2c8e avformat/mlvdec: read_string() received unsigned size, make the argument unsigned 
Fixes: infinite loop
Fixes: mlv-timeout-e3b8cab9835edecad6823baa057e029671329d04

Found-by: Paul Ch <paulcher@icloud.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-08-17 21:53:13 +02:00
Marton Balint 18ac642359 avformat: migrate to AVFormatContext->url 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2018-01-28 23:06:43 +01:00
Clément Bœsch bec96a7286 lavf: use av_fourcc2str() where appropriate 2017-03-29 14:49:29 +02:00
James Almer 4de591e6fb Merge commit '83548fe894cdb455cc127f754d09905b6d23c173' 
* commit '83548fe894cdb455cc127f754d09905b6d23c173':
  lavf: fix usage of AVIOContext.seekable

Merged-by: James Almer <jamrial@gmail.com>
 2017-03-21 17:02:30 -03:00
Derek Buitenhuis 6f69f7a8bf Merge commit '9200514ad8717c63f82101dc394f4378854325bf' 
* commit '9200514ad8717c63f82101dc394f4378854325bf':
  lavf: replace AVStream.codec with AVStream.codecpar

This has been a HUGE effort from:
    - Derek Buitenhuis <derek.buitenhuis@gmail.com>
    - Hendrik Leppkes <h.leppkes@gmail.com>
    - wm4 <nfxjfg@googlemail.com>
    - Clément Bœsch <clement@stupeflix.com>
    - James Almer <jamrial@gmail.com>
    - Michael Niedermayer <michael@niedermayer.cc>
    - Rostislav Pehlivanov <atomnuker@gmail.com>

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-10 20:59:55 +01:00
Derek Buitenhuis bc9a5965c8 Merge commit '9f61abc8111c7c43f49ca012e957a108b9cc7610' 
This also deprecates our old duplicated callbacks.

* commit '9f61abc8111c7c43f49ca012e957a108b9cc7610':
  lavf: allow custom IO for all files

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-10 14:42:41 +00:00
Andreas Cadhalpun 7172175da6 mlvdec: validate bits_per_coded_sample 
A negative bits_per_coded_sample doesn't make sense.
If it is too large, the size calculation for av_get_packet overflows,
resulting in allocation of a too small buffer.

Also make sure width and height are sane.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-12-22 19:39:43 +01:00
Andreas Cadhalpun 9fcfe4a3cd mlvdec: check that index_entries exist 
This fixes NULL pointer dereferencing.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-12-20 11:57:54 +01:00
Michael Niedermayer ba77fb61f7 Merge commit 'd80811c94e068085aab797f9ba35790529126f85' 
* commit 'd80811c94e068085aab797f9ba35790529126f85':
  riff: Use the correct logging context

Conflicts:
	libavformat/asfdec_o.c
	libavformat/avidec.c
	libavformat/dxa.c
	libavformat/matroskadec.c
	libavformat/mov.c
	libavformat/riff.h
	libavformat/riffdec.c
	libavformat/wavdec.c
	libavformat/wtvdec.c
	libavformat/xwma.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 15:22:37 +02:00
Michael Niedermayer 62a1e0035a avformat/mlvdec: Use AVFormatContext->open_cb() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-11 22:53:12 +02:00
Carl Eugen Hoyos ac923ed470 lavf/mlv: Only add streams that are supposed to contain frames. 
Fixes ticket #4296.

Reviewed-by: Peter Ross
 2015-02-07 16:23:36 +01:00
Michael Niedermayer d1d8f866b5 avformat/mlvdec: Use avio_closep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 20:19:20 +01:00
Michael Niedermayer edeaf6f3a4 avformat/mlvdec: Simplify code by using avio_closep() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 20:19:20 +01:00
Thomas Volkert 00d7555f34 wavdec: RIFX file format support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-18 00:10:35 +01:00
Michael Niedermayer a9564e859b avformat/mlvdec: Check the return code from strftime() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-26 17:07:29 +01:00
Reimar Döffinger a0941c8a2b Use new av_dict_set_int helper function. 
Get rid of the many, slightly differing, implementations
of basically the same thing.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-16 14:31:41 +02:00
James Almer d34ec64a22 replace calls to url_feof() with avio_feof() 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-08 00:48:38 +02:00
Peter Ross b3c0d010c3 avformat/mlvdec: close any additional .Mxx files 
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-27 15:34:27 +02:00
Peter Ross 8bd6837e51 avformat/mlvdec: remove unused MlvContext.buffer 
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-27 15:34:22 +02:00
Peter Ross 9abf08f79f avformat/mlvdec: print unsigned chunk size 
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-27 14:37:54 +02:00
Peter Ross bdab0c2d76 avformat/mlvdec: process ff_get_wav_header return value 
Fixes CID1206640.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-27 14:37:18 +02:00
Peter Ross ab683efb2b Magic Lantern Video (MLV) demuxer 
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-19 05:06:00 +02:00