[FFmpeg-cvslog] fftools/ffmpeg_dec: drop useless and racy code
Anton Khirnov
git at videolan.org
Tue Jan 30 11:07:30 EET 2024
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Jan 11 12:04:56 2024 +0100| [27de2aacd15c78015327cfcc7e890b25d5295b02] | committer: Anton Khirnov
fftools/ffmpeg_dec: drop useless and racy code
Setting demuxer's video_delay from the decoder cannot accomplish
anything meaningful and is racy, as they run in different threads.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=27de2aacd15c78015327cfcc7e890b25d5295b02
---
fftools/ffmpeg_dec.c | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c
index 58be466e4c..e2d503f441 100644
--- a/fftools/ffmpeg_dec.c
+++ b/fftools/ffmpeg_dec.c
@@ -263,21 +263,6 @@ static int video_frame_process(InputStream *ist, AVFrame *frame)
{
DecoderPriv *dp = dp_from_dec(ist->decoder);
- // The following line may be required in some cases where there is no parser
- // or the parser does not has_b_frames correctly
- if (ist->par->video_delay < dp->dec_ctx->has_b_frames) {
- if (dp->dec_ctx->codec_id == AV_CODEC_ID_H264) {
- ist->par->video_delay = dp->dec_ctx->has_b_frames;
- } else
- av_log(dp->dec_ctx, AV_LOG_WARNING,
- "video_delay is larger in decoder than demuxer %d > %d.\n"
- "If you want to help, upload a sample "
- "of this file to https://streams.videolan.org/upload/ "
- "and contact the ffmpeg-devel mailing list. (ffmpeg-devel at ffmpeg.org)\n",
- dp->dec_ctx->has_b_frames,
- ist->par->video_delay);
- }
-
if (dp->dec_ctx->width != frame->width ||
dp->dec_ctx->height != frame->height ||
dp->dec_ctx->pix_fmt != frame->format) {
More information about the ffmpeg-cvslog
mailing list