diff options
| author | Anton Khirnov <anton@khirnov.net> | 2022-08-03 11:54:08 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2022-08-08 16:20:58 +0200 |
| commit | 49123dd05814901fa198c31de62c70a7d482288c (patch) | |
| tree | 684c3e92fa1c82fb9c0180c0924d0aa49e04b25d | |
| parent | 8e092c3eac399d457e470decffa1081251d00648 (diff) | |
| download | ffmpeg-49123dd05814901fa198c31de62c70a7d482288c.tar.gz | |
fftools/ffmpeg: remove OutputStream.sync_ist
It is not actually used for anything.
| -rw-r--r-- | fftools/ffmpeg.c | 4 | ||||
| -rw-r--r-- | fftools/ffmpeg.h | 1 | ||||
| -rw-r--r-- | fftools/ffmpeg_opt.c | 18 |
3 files changed, 6 insertions, 17 deletions
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index a38e758e77..7f5c6690dd 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -3409,10 +3409,6 @@ static int transcode_init(void) input_streams[ost->source_index]->st->index, ost->file_index, ost->index); - if (ost->sync_ist != input_streams[ost->source_index]) - av_log(NULL, AV_LOG_INFO, " [sync #%d:%d]", - ost->sync_ist->file_index, - ost->sync_ist->st->index); if (ost->enc_ctx) { const AVCodec *in_codec = input_streams[ost->source_index]->dec; const AVCodec *out_codec = ost->enc; diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 69e4758a2d..b7d62957f8 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -468,7 +468,6 @@ typedef struct OutputStream { int64_t vsync_frame_number; /* input pts and corresponding output pts for A/V sync */ - struct InputStream *sync_ist; /* input stream to sync against */ int64_t sync_opts; /* output frame counter, could be changed to some true timestamp */ // FIXME look at frame_number /* pts of the first frame encoded for this stream, used for limiting * recording time */ diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index ffa320da87..0cd807c9c8 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1757,7 +1757,6 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e ost->source_index = source_index; if (source_index >= 0) { - ost->sync_ist = input_streams[source_index]; input_streams[source_index]->discard = 0; input_streams[source_index]->st->discard = input_streams[source_index]->user_set_discard; } @@ -2650,7 +2649,6 @@ static void map_manual(OutputFile *of, AVFormatContext *oc, OptionsContext *o, const StreamMap *map) { InputStream *ist; - OutputStream *ost; if (map->disabled) return; @@ -2695,16 +2693,15 @@ loop_end: if(o-> data_disable && ist->st->codecpar->codec_type == AVMEDIA_TYPE_DATA) return; - ost = NULL; switch (ist->st->codecpar->codec_type) { - case AVMEDIA_TYPE_VIDEO: ost = new_video_stream (o, oc, src_idx); break; - case AVMEDIA_TYPE_AUDIO: ost = new_audio_stream (o, oc, src_idx); break; - case AVMEDIA_TYPE_SUBTITLE: ost = new_subtitle_stream (o, oc, src_idx); break; - case AVMEDIA_TYPE_DATA: ost = new_data_stream (o, oc, src_idx); break; - case AVMEDIA_TYPE_ATTACHMENT: ost = new_attachment_stream(o, oc, src_idx); break; + case AVMEDIA_TYPE_VIDEO: new_video_stream (o, oc, src_idx); break; + case AVMEDIA_TYPE_AUDIO: new_audio_stream (o, oc, src_idx); break; + case AVMEDIA_TYPE_SUBTITLE: new_subtitle_stream (o, oc, src_idx); break; + case AVMEDIA_TYPE_DATA: new_data_stream (o, oc, src_idx); break; + case AVMEDIA_TYPE_ATTACHMENT: new_attachment_stream(o, oc, src_idx); break; case AVMEDIA_TYPE_UNKNOWN: if (copy_unknown_streams) { - ost = new_unknown_stream (o, oc, src_idx); + new_unknown_stream (o, oc, src_idx); break; } default: @@ -2719,9 +2716,6 @@ loop_end: exit_program(1); } } - if (ost) - ost->sync_ist = input_streams[ input_files[map->sync_file_index]->ist_index - + map->sync_stream_index]; } } |