diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-07-09 12:07:28 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-07-10 21:31:36 +0200 |
| commit | 40e049856e4f78f2a91d0f7b8b80915e87c59d04 (patch) | |
| tree | 333a9d18902595befa41c048d5d4587cc4a750d6 | |
| parent | f9f95ceebfbd7b7f43c1b7ad34e25d366e6e2d2b (diff) | |
| download | ffmpeg-40e049856e4f78f2a91d0f7b8b80915e87c59d04.tar.gz | |
avformat/mm: Check for existence of audio stream
No audio stream is created unconditionally and if none has been created,
no packet with stream_index 1 may be returned. This fixes an assert in
ff_read_packet() in libavformat/utils reported in ticket #8782.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
(cherry picked from commit ec59dc73f0cc8930bf5dae389cd76d049d537ca7)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
| -rw-r--r-- | libavformat/mm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/mm.c b/libavformat/mm.c index 83b3c200c6..d09e98a2ce 100644 --- a/libavformat/mm.c +++ b/libavformat/mm.c @@ -174,6 +174,8 @@ static int read_packet(AVFormatContext *s, return 0; case MM_TYPE_AUDIO : + if (s->nb_streams < 2) + return AVERROR_INVALIDDATA; if (av_get_packet(s->pb, pkt, length)<0) return AVERROR(ENOMEM); pkt->stream_index = 1; |