virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
Code Issues Releases Activity

avformat/mov: don't return the latest stream when an item stream is expected

Browse Source 
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>
(cherry picked from commit 04182b55494b44152146e6a6bcd5eb9403f00625)
This commit is contained in:
James Almer 2024-09-30 10:59:02 -03:00
parent b08d7969c5
commit 12682eba2e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/mov.c
View File

@ -188,6 +188,10 @@ static int mov_read_mac_string(MOVContext *c, AVIOContext *pb, int len,
return p - dst; 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) static AVStream *get_curr_st(MOVContext *c)
{ {
AVStream *st = NULL; AVStream *st = NULL;
@ -206,7 +210,7 @@ static AVStream *get_curr_st(MOVContext *c)
st = item->st; st = item->st;
break; break;
} }
if (!st) if (!st && c->cur_item_id == -1)
st = c->fc->streams[c->fc->nb_streams-1]; st = c->fc->streams[c->fc->nb_streams-1];
return st; return st;