diff options
author | Anton Khirnov <anton@khirnov.net> | 2022-10-20 09:09:45 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2022-10-21 10:13:16 +0200 |
commit | 4cfffdd5519516ee7b6b440920d0aededc4bc06f (patch) | |
tree | bd5650987af06564f8e17a63e7213791bd9736b8 /fftools/ffmpeg.h | |
parent | 9184d3d7b64459e975f26284a7b2e26cbf76480b (diff) | |
download | ffmpeg-4cfffdd5519516ee7b6b440920d0aededc4bc06f.tar.gz |
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.h')
-rw-r--r-- | fftools/ffmpeg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 2dcce45741..5966cac60e 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -702,7 +702,7 @@ void remove_avoptions(AVDictionary **a, AVDictionary *b); void assert_avoptions(AVDictionary *m); void assert_file_overwrite(const char *filename); -char *read_file(const char *filename); +char *file_read(const char *filename); AVDictionary *strip_specifiers(AVDictionary *dict); const AVCodec *find_codec_or_die(const char *name, enum AVMediaType type, int encoder); int parse_and_set_vsync(const char *arg, int *vsync_var, int file_idx, int st_idx, int is_global); |