diff options
| author | Anton Khirnov <anton@khirnov.net> | 2022-10-20 10:09:45 +0300 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2022-10-21 11:13:16 +0300 |
| commit | 4cfffdd5519516ee7b6b440920d0aededc4bc06f (patch) | |
| tree | bd5650987af06564f8e17a63e7213791bd9736b8 /fftools/ffmpeg_opt.c | |
| parent | 9184d3d7b64459e975f26284a7b2e26cbf76480b (diff) | |
fftools/ffmpeg: rename read_file() to avoid conflict with libass
libass defines a non-static read_file() symbol, which causes conflicts
with static linking.
Diffstat (limited to 'fftools/ffmpeg_opt.c')
| -rw-r--r-- | fftools/ffmpeg_opt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index ead4ee1b38..9245e02813 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1300,7 +1300,7 @@ static int open_input_file(OptionsContext *o, const char *filename) } /* read file contents into a string */ -char *read_file(const char *filename) +char *file_read(const char *filename) { AVIOContext *pb = NULL; int ret = avio_open(&pb, filename, AVIO_FLAG_READ); @@ -1725,7 +1725,7 @@ static int opt_filter_complex(void *optctx, const char *opt, const char *arg) static int opt_filter_complex_script(void *optctx, const char *opt, const char *arg) { FilterGraph *fg; - char *graph_desc = read_file(arg); + char *graph_desc = file_read(arg); if (!graph_desc) return AVERROR(EINVAL); |