diff options
| author | Anton Khirnov <anton@khirnov.net> | 2023-04-20 09:06:25 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2023-05-02 10:59:24 +0200 |
| commit | f4a60b8ddc07b9385b601d18c00c600b50402481 (patch) | |
| tree | 0eb76fff1066695ccbbd58b31953b61972f7ec86 | |
| parent | 5a04aae82193d75b8f8814dc7e35f4cc84b1beba (diff) | |
fftools/ffmpeg: reduce access to OutputStream.enc_ctx
It will be made private to Encoder in the future.
| -rw-r--r-- | fftools/ffmpeg.c | 7 | ||||
| -rw-r--r-- | fftools/ffmpeg_mux.c | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 15fe839914..1ae2c5c18f 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -649,8 +649,7 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti av_bprint_init(&buf, 0, AV_BPRINT_SIZE_AUTOMATIC); av_bprint_init(&buf_script, 0, AV_BPRINT_SIZE_AUTOMATIC); for (OutputStream *ost = ost_iter(NULL); ost; ost = ost_iter(ost)) { - const AVCodecContext * const enc = ost->enc_ctx; - const float q = enc ? ost->quality / (float) FF_QP2LAMBDA : -1; + const float q = ost->enc ? ost->quality / (float) FF_QP2LAMBDA : -1; if (vid && ost->type == AVMEDIA_TYPE_VIDEO) { av_bprintf(&buf, "q=%2.1f ", q); @@ -1155,7 +1154,7 @@ static int process_subtitle(InputStream *ist, AVSubtitle *subtitle, int *got_out for (int oidx = 0; oidx < ist->nb_outputs; oidx++) { OutputStream *ost = ist->outputs[oidx]; - if (!ost->enc_ctx || ost->enc_ctx->codec_type != AVMEDIA_TYPE_SUBTITLE) + if (!ost->enc || ost->type != AVMEDIA_TYPE_SUBTITLE) continue; enc_subtitle(output_files[ost->file_index], ost, subtitle); @@ -1527,7 +1526,7 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo for (int oidx = 0; oidx < ist->nb_outputs; oidx++) { OutputStream *ost = ist->outputs[oidx]; - if (ost->enc_ctx || (!pkt && no_eof)) + if (ost->enc || (!pkt && no_eof)) continue; if (duration_exceeded) { diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index a19f1a1f1e..52f98fb76a 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -742,7 +742,7 @@ static void mux_final_stats(Muxer *mux) av_log(of, AV_LOG_VERBOSE, " Output stream #%d:%d (%s): ", of->index, j, av_get_media_type_string(type)); - if (ost->enc_ctx) { + if (ost->enc) { av_log(of, AV_LOG_VERBOSE, "%"PRIu64" frames encoded", ost->frames_encoded); if (type == AVMEDIA_TYPE_AUDIO) |