virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
Code Issues Releases Activity

fftools/ffmpeg: remove OutputStream.sync_ist

Browse Source 
It is not actually used for anything.
This commit is contained in:
Anton Khirnov 2022-08-03 11:54:08 +02:00
parent 8e092c3eac
commit 49123dd058
3 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fftools/ffmpeg.c
View File

@ -3409,10 +3409,6 @@ static int transcode_init(void)
input_streams[ost->source_index]->st->index, input_streams[ost->source_index]->st->index,
ost->file_index, ost->file_index,
ost->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) { if (ost->enc_ctx) {
const AVCodec *in_codec = input_streams[ost->source_index]->dec; const AVCodec *in_codec = input_streams[ost->source_index]->dec;
const AVCodec *out_codec = ost->enc; const AVCodec *out_codec = ost->enc;

1
fftools/ffmpeg.h
View File

@ -468,7 +468,6 @@ typedef struct OutputStream {
int64_t vsync_frame_number; int64_t vsync_frame_number;
/* input pts and corresponding output pts /* input pts and corresponding output pts
for A/V sync */ 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 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 /* pts of the first frame encoded for this stream, used for limiting
* recording time */ * recording time */

18
fftools/ffmpeg_opt.c
View File

@ -1757,7 +1757,6 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
ost->source_index = source_index; ost->source_index = source_index;
if (source_index >= 0) { if (source_index >= 0) {
ost->sync_ist = input_streams[source_index];
input_streams[source_index]->discard = 0; input_streams[source_index]->discard = 0;
input_streams[source_index]->st->discard = input_streams[source_index]->user_set_discard; 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) OptionsContext *o, const StreamMap *map)
{ {
InputStream *ist; InputStream *ist;
OutputStream *ost;
if (map->disabled) if (map->disabled)
return; return;
@ -2695,16 +2693,15 @@ loop_end:
if(o-> data_disable && ist->st->codecpar->codec_type == AVMEDIA_TYPE_DATA) if(o-> data_disable && ist->st->codecpar->codec_type == AVMEDIA_TYPE_DATA)
return; return;
ost = NULL;
switch (ist->st->codecpar->codec_type) { switch (ist->st->codecpar->codec_type) {
case AVMEDIA_TYPE_VIDEO: ost = new_video_stream (o, oc, src_idx); break; case AVMEDIA_TYPE_VIDEO: new_video_stream (o, oc, src_idx); break;
case AVMEDIA_TYPE_AUDIO: ost = new_audio_stream (o, oc, src_idx); break; case AVMEDIA_TYPE_AUDIO: new_audio_stream (o, oc, src_idx); break;
case AVMEDIA_TYPE_SUBTITLE: ost = new_subtitle_stream (o, oc, src_idx); break; case AVMEDIA_TYPE_SUBTITLE: new_subtitle_stream (o, oc, src_idx); break;
case AVMEDIA_TYPE_DATA: ost = new_data_stream (o, oc, src_idx); break; case AVMEDIA_TYPE_DATA: new_data_stream (o, oc, src_idx); break;
case AVMEDIA_TYPE_ATTACHMENT: ost = new_attachment_stream(o, oc, src_idx); break; case AVMEDIA_TYPE_ATTACHMENT: new_attachment_stream(o, oc, src_idx); break;
case AVMEDIA_TYPE_UNKNOWN: case AVMEDIA_TYPE_UNKNOWN:
if (copy_unknown_streams) { if (copy_unknown_streams) {
ost = new_unknown_stream (o, oc, src_idx); new_unknown_stream (o, oc, src_idx);
break; break;
} }
default: default:
@ -2719,9 +2716,6 @@ loop_end:
exit_program(1); exit_program(1);
} }
} }
if (ost)
ost->sync_ist = input_streams[ input_files[map->sync_file_index]->ist_index
+ map->sync_stream_index];
} }
} }