diff options
| author | Anton Khirnov <anton@khirnov.net> | 2021-12-04 14:53:58 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2021-12-07 11:23:45 +0100 |
| commit | 011114f3e1593a2397871632937a2c23a1402efe (patch) | |
| tree | 0b0b4b1e0ddd77eb0be8a762ecaf7e0293d8b59f /fftools | |
| parent | bb6f591c4938b98b748e43625a54015486a6ed94 (diff) | |
ffmpeg: change vsync value to an enum
Stop explicitly defining VSCFR and DROP values, which were never
documented.
Diffstat (limited to 'fftools')
| -rw-r--r-- | fftools/ffmpeg.c | 3 | ||||
| -rw-r--r-- | fftools/ffmpeg.h | 16 | ||||
| -rw-r--r-- | fftools/ffmpeg_opt.c | 2 |
3 files changed, 12 insertions, 9 deletions
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 6827899b90..1c3c1d3dbf 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1143,7 +1143,8 @@ static void do_video_out(OutputFile *of, OutputStream *ost, AVFrame *next_picture) { - int ret, format_video_sync; + int ret; + enum VideoSyncMethod format_video_sync; AVPacket *pkt = ost->pkt; AVCodecContext *enc = ost->enc_ctx; AVRational frame_rate; diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index cc7ba9bdca..83e37cbed7 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -47,12 +47,14 @@ #include "libswresample/swresample.h" -#define VSYNC_AUTO -1 -#define VSYNC_PASSTHROUGH 0 -#define VSYNC_CFR 1 -#define VSYNC_VFR 2 -#define VSYNC_VSCFR 0xfe -#define VSYNC_DROP 0xff +enum VideoSyncMethod { + VSYNC_AUTO = -1, + VSYNC_PASSTHROUGH, + VSYNC_CFR, + VSYNC_VFR, + VSYNC_VSCFR, + VSYNC_DROP, +}; #define MAX_STREAMS 1024 /* arbitrary sanity check value */ @@ -605,7 +607,7 @@ extern float dts_error_threshold; extern int audio_volume; extern int audio_sync_method; -extern int video_sync_method; +extern enum VideoSyncMethod video_sync_method; extern float frame_drop_threshold; extern int do_benchmark; extern int do_benchmark_all; diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index b5996a9273..d478008866 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -147,7 +147,7 @@ float dts_error_threshold = 3600*30; int audio_volume = 256; int audio_sync_method = 0; -int video_sync_method = VSYNC_AUTO; +enum VideoSyncMethod video_sync_method = VSYNC_AUTO; float frame_drop_threshold = 0; int do_benchmark = 0; int do_benchmark_all = 0; |