mirror of https://git.ffmpeg.org/ffmpeg.git
fftools/ffmpeg: rename read_file() to avoid conflict with libass
libass defines a non-static read_file() symbol, which causes conflicts with static linking.
This commit is contained in:
parent
9184d3d7b6
commit
4cfffdd551
|
@ -702,7 +702,7 @@ void remove_avoptions(AVDictionary **a, AVDictionary *b);
|
||||||
void assert_avoptions(AVDictionary *m);
|
void assert_avoptions(AVDictionary *m);
|
||||||
|
|
||||||
void assert_file_overwrite(const char *filename);
|
void assert_file_overwrite(const char *filename);
|
||||||
char *read_file(const char *filename);
|
char *file_read(const char *filename);
|
||||||
AVDictionary *strip_specifiers(AVDictionary *dict);
|
AVDictionary *strip_specifiers(AVDictionary *dict);
|
||||||
const AVCodec *find_codec_or_die(const char *name, enum AVMediaType type, int encoder);
|
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);
|
int parse_and_set_vsync(const char *arg, int *vsync_var, int file_idx, int st_idx, int is_global);
|
||||||
|
|
|
@ -380,7 +380,7 @@ static char *get_ost_filters(OptionsContext *o, AVFormatContext *oc,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ost->filters_script)
|
if (ost->filters_script)
|
||||||
return read_file(ost->filters_script);
|
return file_read(ost->filters_script);
|
||||||
else if (ost->filters)
|
else if (ost->filters)
|
||||||
return av_strdup(ost->filters);
|
return av_strdup(ost->filters);
|
||||||
|
|
||||||
|
@ -585,7 +585,7 @@ static OutputStream *new_video_stream(Muxer *mux, OptionsContext *o, int source_
|
||||||
av_dict_set(&ost->encoder_opts, "stats", logfilename, AV_DICT_DONT_OVERWRITE);
|
av_dict_set(&ost->encoder_opts, "stats", logfilename, AV_DICT_DONT_OVERWRITE);
|
||||||
} else {
|
} else {
|
||||||
if (video_enc->flags & AV_CODEC_FLAG_PASS2) {
|
if (video_enc->flags & AV_CODEC_FLAG_PASS2) {
|
||||||
char *logbuffer = read_file(logfilename);
|
char *logbuffer = file_read(logfilename);
|
||||||
|
|
||||||
if (!logbuffer) {
|
if (!logbuffer) {
|
||||||
av_log(NULL, AV_LOG_FATAL, "Error reading log file '%s' for pass-2 encoding\n",
|
av_log(NULL, AV_LOG_FATAL, "Error reading log file '%s' for pass-2 encoding\n",
|
||||||
|
|
|
@ -1300,7 +1300,7 @@ static int open_input_file(OptionsContext *o, const char *filename)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* read file contents into a string */
|
/* read file contents into a string */
|
||||||
char *read_file(const char *filename)
|
char *file_read(const char *filename)
|
||||||
{
|
{
|
||||||
AVIOContext *pb = NULL;
|
AVIOContext *pb = NULL;
|
||||||
int ret = avio_open(&pb, filename, AVIO_FLAG_READ);
|
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)
|
static int opt_filter_complex_script(void *optctx, const char *opt, const char *arg)
|
||||||
{
|
{
|
||||||
FilterGraph *fg;
|
FilterGraph *fg;
|
||||||
char *graph_desc = read_file(arg);
|
char *graph_desc = file_read(arg);
|
||||||
if (!graph_desc)
|
if (!graph_desc)
|
||||||
return AVERROR(EINVAL);
|
return AVERROR(EINVAL);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue