highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/utils: constrain the lifetime of the pointer returned by avformat_index_get_entry()

Browse Source 
This will give us more room to improve the implementation later.

Suggested-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2021-04-08 14:16:53 -03:00
parent 55475b3289
commit 74dce63f9a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/avformat.h
View File

@ -2535,10 +2535,10 @@ int avformat_index_get_entries_count(const AVStream *st);
* @return A pointer to the requested AVIndexEntry if it exists, NULL otherwise.
*
* @note The pointer returned by this function is only guaranteed to be valid
* until any function that could alter the stream or the AVFormatContext
* that contains it is called.
* until any function that takes the stream or the parent AVFormatContext
* as input argument is called.
*/
const AVIndexEntry *avformat_index_get_entry(const AVStream *st, int idx);
const AVIndexEntry *avformat_index_get_entry(AVStream *st, int idx);
/**
* Get the AVIndexEntry corresponding to the given timestamp.
@ -2552,10 +2552,10 @@ const AVIndexEntry *avformat_index_get_entry(const AVStream *st, int idx);
* @return A pointer to the requested AVIndexEntry if it exists, NULL otherwise.
*
* @note The pointer returned by this function is only guaranteed to be valid
* until any function that could alter the stream or the AVFormatContext
* that contains it is called.
* until any function that takes the stream or the parent AVFormatContext
* as input argument is called.
*/
const AVIndexEntry *avformat_index_get_entry_from_timestamp(const AVStream *st,
const AVIndexEntry *avformat_index_get_entry_from_timestamp(AVStream *st,
int64_t wanted_timestamp,
int flags);
/**

4
libavformat/utils.c
View File

@ -2057,7 +2057,7 @@ int avformat_index_get_entries_count(const AVStream *st)
return st->internal->nb_index_entries;
}
const AVIndexEntry *avformat_index_get_entry(const AVStream *st, int idx)
const AVIndexEntry *avformat_index_get_entry(AVStream *st, int idx)
{
if (idx < 0 || idx >= st->internal->nb_index_entries)
return NULL;
@ -2065,7 +2065,7 @@ const AVIndexEntry *avformat_index_get_entry(const AVStream *st, int idx)
return &st->internal->index_entries[idx];
}
const AVIndexEntry *avformat_index_get_entry_from_timestamp(const AVStream *st,
const AVIndexEntry *avformat_index_get_entry_from_timestamp(AVStream *st,
int64_t wanted_timestamp,
int flags)
{