[FFmpeg-cvslog] avformat/utils: Don't initialize AVStreamInternal.info multiple times
Andreas Rheinhardt
git at videolan.org
Tue Aug 31 18:43:42 EEST 2021
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Thu Aug 26 22:18:04 2021 +0200| [10646d30a3637d1bd0a563c025caea31f81b27d3] | committer: Andreas Rheinhardt
avformat/utils: Don't initialize AVStreamInternal.info multiple times
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 at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=10646d30a3637d1bd0a563c025caea31f81b27d3
---
libavformat/utils.c | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 79fa9382cf..8cbe2a0278 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -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)
More information about the ffmpeg-cvslog
mailing list