diff options
| author | James Almer <jamrial@gmail.com> | 2024-09-30 10:59:02 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2024-09-30 10:59:05 -0300 |
| commit | 04182b55494b44152146e6a6bcd5eb9403f00625 (patch) | |
| tree | 4cdec3fc4250c84fdef677a97fbe570cc0a9fcf2 | |
| parent | 6057cd8aeee5c2ed8397fcbf0ee74de26701b5aa (diff) | |
| download | ffmpeg-04182b55494b44152146e6a6bcd5eb9403f00625.tar.gz | |
avformat/mov: don't return the latest stream when an item stream is expected
Otherwise, things like ICC profiles as read from the colr box meant for an item
with no stream (like a grid) may end up being added to the wrong stream.
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavformat/mov.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index a2333ac1fd..5b0b23ffc1 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -188,6 +188,10 @@ static int mov_read_mac_string(MOVContext *c, AVIOContext *pb, int len, return p - dst; } +/** + * Get the current stream in the parsing process. This can either be the + * latest stream added to the context, or the stream referenced by an item. + */ static AVStream *get_curr_st(MOVContext *c) { AVStream *st = NULL; @@ -206,7 +210,7 @@ static AVStream *get_curr_st(MOVContext *c) st = item->st; break; } - if (!st) + if (!st && c->cur_item_id == -1) st = c->fc->streams[c->fc->nb_streams-1]; return st; |