virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

avformat/utils: Don't initialize AVStreamInternal.info multiple times

Browse Source 
It has been allocated and initialized in avformat_find_stream_info()
until fd0368e7ca35e2feaf7960564e61a76655c4d1f6 when the structure
was moved to AVStreamInternal and its allocation to avformat_new_stream.
In order to also initialize the struct for new streams that only get
created during avformat_find_stream_info() said the initialization has
been added to avformat_new_stream() later. Due to the Libav-FFmpeg split
this has been done twice: In 4cda8aa1c5bc58f8a7f53a21a19b03e7379bbcdc
and in 30c26c2442e4e44ac5a763c23c4b0fdd9921a7f5. The initialization in
avformat_find_stream_info() has not been removed at all despite being
redundant. This commit removes it and the duplicated initialization in
avformat_new_stream().

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-08-26 22:18:04 +02:00
parent 2c3c83663d
commit 10646d30a3
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/utils.c
View File

@ -3624,14 +3624,6 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
av_dict_free(&thread_opt);
}
for (i = 0; i < ic->nb_streams; i++) {
#if FF_API_R_FRAME_RATE
ic->streams[i]->internal->info->last_dts = AV_NOPTS_VALUE;
#endif
ic->streams[i]->internal->info->fps_first_dts = AV_NOPTS_VALUE;
ic->streams[i]->internal->info->fps_last_dts = AV_NOPTS_VALUE;
}
read_size = 0;
for (;;) {
const AVPacket *pkt;
@ -4379,7 +4371,6 @@ AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c)
st->internal->info = av_mallocz(sizeof(*st->internal->info));
if (!st->internal->info)
goto fail;
st->internal->info->last_dts = AV_NOPTS_VALUE;
st->codecpar = avcodec_parameters_alloc();
if (!st->codecpar)