highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fftools/ffmpeg: cosmetics, vertically align Input{File,Stream}

Browse Source
This commit is contained in:
Anton Khirnov
2024-01-24 09:15:37 +01:00
parent f4b76a1d6a
commit 093be1fb06
1 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
fftools/ffmpeg.h
View File

@@ -328,35 +328,36 @@ typedef struct Decoder {
} Decoder; } Decoder;
typedef struct InputStream { typedef struct InputStream {
const AVClass *class; const AVClass *class;
/* parent source */ /* parent source */
struct InputFile *file; struct InputFile *file;
int index; int index;
AVStream *st; AVStream *st;
int user_set_discard; int user_set_discard;
/** /**
* Codec parameters - to be used by the decoding/streamcopy code. * Codec parameters - to be used by the decoding/streamcopy code.
* st->codecpar should not be accessed, because it may be modified * st->codecpar should not be accessed, because it may be modified
* concurrently by the demuxing thread. * concurrently by the demuxing thread.
*/ */
AVCodecParameters *par; AVCodecParameters *par;
Decoder *decoder; Decoder *decoder;
const AVCodec *dec; const AVCodec *dec;
AVRational framerate_guessed; AVRational framerate_guessed;
AVRational framerate; /* framerate forced with -r */ /* framerate forced with -r */
AVRational framerate;
#if FFMPEG_OPT_TOP #if FFMPEG_OPT_TOP
int top_field_first; int top_field_first;
#endif #endif
int autorotate; int autorotate;
int fix_sub_duration; int fix_sub_duration;
struct sub2video { struct sub2video {
int w, h; int w, h;
@@ -364,8 +365,8 @@ typedef struct InputStream {
/* decoded data from this stream goes into all those filters /* decoded data from this stream goes into all those filters
* currently video and audio only */ * currently video and audio only */
InputFilter **filters; InputFilter **filters;
int nb_filters; int nb_filters;
/* /*
* Output targets that do not go through lavfi, i.e. subtitles or * Output targets that do not go through lavfi, i.e. subtitles or
@@ -379,28 +380,29 @@ typedef struct InputStream {
} InputStream; } InputStream;
typedef struct InputFile { typedef struct InputFile {
const AVClass *class; const AVClass *class;
int index; int index;
AVFormatContext *ctx; AVFormatContext *ctx;
int64_t input_ts_offset; int64_t input_ts_offset;
int input_sync_ref; int input_sync_ref;
/** /**
* Effective format start time based on enabled streams. * Effective format start time based on enabled streams.
*/ */
int64_t start_time_effective; int64_t start_time_effective;
int64_t ts_offset; int64_t ts_offset;
int64_t start_time; /* user-specified start time in AV_TIME_BASE or AV_NOPTS_VALUE */ /* user-specified start time in AV_TIME_BASE or AV_NOPTS_VALUE */
int64_t recording_time; int64_t start_time;
int64_t recording_time;
/* streams that ffmpeg is aware of; /* streams that ffmpeg is aware of;
* there may be extra streams in ctx that are not mapped to an InputStream * there may be extra streams in ctx that are not mapped to an InputStream
* if new streams appear dynamically during demuxing */ * if new streams appear dynamically during demuxing */
InputStream **streams; InputStream **streams;
int nb_streams; int nb_streams;
int accurate_seek; int accurate_seek;
} InputFile; } InputFile;
enum forced_keyframes_const { enum forced_keyframes_const {