eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-15 03:20:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

fftools/ffmpeg: do not log to the muxer context

Browse Source 
All other logging goes to NULL context.
This commit is contained in:
Anton Khirnov
2021-12-11 16:13:13 +01:00
parent 48989efb76
commit 35bfcff07f
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fftools/ffmpeg.c
View File

@@ -2913,7 +2913,6 @@ static void init_encoder_time_base(OutputStream *ost, AVRational default_time_ba
{ {
InputStream *ist = get_input_stream(ost); InputStream *ist = get_input_stream(ost);
AVCodecContext *enc_ctx = ost->enc_ctx; AVCodecContext *enc_ctx = ost->enc_ctx;
AVFormatContext *oc;
if (ost->enc_timebase.num > 0) { if (ost->enc_timebase.num > 0) {
enc_ctx->time_base = ost->enc_timebase; enc_ctx->time_base = ost->enc_timebase;
@@ -2926,8 +2925,9 @@ static void init_encoder_time_base(OutputStream *ost, AVRational default_time_ba
return; return;
} }
oc = output_files[ost->file_index]->ctx; av_log(NULL, AV_LOG_WARNING,
av_log(oc, AV_LOG_WARNING, "Input stream data not available, using default time base\n"); "Input stream data for output stream #%d:%d not available, "
"using default time base\n", ost->file_index, ost->index);
} }
enc_ctx->time_base = default_time_base; enc_ctx->time_base = default_time_base;
@@ -2939,7 +2939,6 @@ static int init_output_stream_encode(OutputStream *ost, AVFrame *frame)
AVCodecContext *enc_ctx = ost->enc_ctx; AVCodecContext *enc_ctx = ost->enc_ctx;
AVCodecContext *dec_ctx = NULL; AVCodecContext *dec_ctx = NULL;
OutputFile *of = output_files[ost->file_index]; OutputFile *of = output_files[ost->file_index];
AVFormatContext *oc = of->ctx;
int ret; int ret;
set_encoder_id(output_files[ost->file_index], ost); set_encoder_id(output_files[ost->file_index], ost);
@@ -3002,7 +3001,7 @@ static int init_output_stream_encode(OutputStream *ost, AVFrame *frame)
if ( av_q2d(enc_ctx->time_base) < 0.001 && ost->vsync_method != VSYNC_PASSTHROUGH if ( av_q2d(enc_ctx->time_base) < 0.001 && ost->vsync_method != VSYNC_PASSTHROUGH
&& (ost->vsync_method == VSYNC_CFR || ost->vsync_method == VSYNC_VSCFR || && (ost->vsync_method == VSYNC_CFR || ost->vsync_method == VSYNC_VSCFR ||
(ost->vsync_method == VSYNC_AUTO && !(of->format->flags & AVFMT_VARIABLE_FPS)))){ (ost->vsync_method == VSYNC_AUTO && !(of->format->flags & AVFMT_VARIABLE_FPS)))){
av_log(oc, AV_LOG_WARNING, "Frame rate very high for a muxer not efficiently supporting it.\n" av_log(NULL, AV_LOG_WARNING, "Frame rate very high for a muxer not efficiently supporting it.\n"
"Please consider specifying a lower framerate, a different muxer or " "Please consider specifying a lower framerate, a different muxer or "
"setting vsync/fps_mode to vfr\n"); "setting vsync/fps_mode to vfr\n");
} }