ffmpeg | branch: master | Anton Khirnov <an...@khirnov.net> | Fri Mar 22 21:27:01 2024 +0100| [a69cedb6a641c7dd742adac917f63fe3c0c8a064] | committer: Anton Khirnov
fftools/ffmpeg_demux: make InputStream.autorotate private It is no longer accessed outside of ffmpeg_demux. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a69cedb6a641c7dd742adac917f63fe3c0c8a064 --- fftools/ffmpeg.h | 2 -- fftools/ffmpeg_demux.c | 8 +++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index bf6e0c9084..a575ee70d5 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -370,8 +370,6 @@ typedef struct InputStream { int top_field_first; #endif - int autorotate; - int fix_sub_duration; /* decoded data from this stream goes into all those filters diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index af4b4cfd1e..d815dd3696 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -64,6 +64,8 @@ typedef struct DemuxStream { int streamcopy_needed; int have_sub2video; int reinit_filters; + int autorotate; + int wrap_correction_done; int saw_first_ts; @@ -1055,7 +1057,7 @@ int ist_filter_add(InputStream *ist, InputFilter *ifilter, int is_simple, if (!opts->name) return AVERROR(ENOMEM); - opts->flags |= IFILTER_FLAG_AUTOROTATE * !!(ist->autorotate) | + opts->flags |= IFILTER_FLAG_AUTOROTATE * !!(ds->autorotate) | IFILTER_FLAG_REINIT * !!(ds->reinit_filters); return ds->sch_idx_dec; @@ -1235,8 +1237,8 @@ static int ist_add(const OptionsContext *o, Demuxer *d, AVStream *st) ds->ts_scale = 1.0; MATCH_PER_STREAM_OPT(ts_scale, dbl, ds->ts_scale, ic, st); - ist->autorotate = 1; - MATCH_PER_STREAM_OPT(autorotate, i, ist->autorotate, ic, st); + ds->autorotate = 1; + MATCH_PER_STREAM_OPT(autorotate, i, ds->autorotate, ic, st); MATCH_PER_STREAM_OPT(codec_tags, str, codec_tag, ic, st); if (codec_tag) { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
