generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmdutils: Rename read_file to cmdutils_read_file

Browse Source 
This symbol name clashes with a symbol in gnutls, if linking
statically to that library.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2011-02-07 11:49:37 +02:00
parent 45235d69c2
commit 02170990fd
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
avconv.c
View File

@ -2178,7 +2178,7 @@ static int transcode_init(OutputFile *output_files,
} else { } else {
char *logbuffer; char *logbuffer;
size_t logbuffer_size; size_t logbuffer_size;
if (read_file(logfilename, &logbuffer, &logbuffer_size) < 0) { if (cmdutils_read_file(logfilename, &logbuffer, &logbuffer_size) < 0) {
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",
logfilename); logfilename);
exit_program(1); exit_program(1);

2
cmdutils.c
View File

@ -785,7 +785,7 @@ int read_yesno(void)
return yesno; return yesno;
} }
int read_file(const char *filename, char **bufptr, size_t *size) int cmdutils_read_file(const char *filename, char **bufptr, size_t *size)
{ {
int ret; int ret;
FILE *f = fopen(filename, "rb"); FILE *f = fopen(filename, "rb");

2
cmdutils.h
View File

@ -309,7 +309,7 @@ int read_yesno(void);
* @return 0 in case of success, a negative value corresponding to an * @return 0 in case of success, a negative value corresponding to an
* AVERROR error code in case of failure. * AVERROR error code in case of failure.
*/ */
int read_file(const char *filename, char **bufptr, size_t *size); int cmdutils_read_file(const char *filename, char **bufptr, size_t *size);
typedef struct { typedef struct {
int64_t num_faulty_pts; /// Number of incorrect PTS values so far int64_t num_faulty_pts; /// Number of incorrect PTS values so far

2
ffmpeg.c
View File

@ -2276,7 +2276,7 @@ static int transcode(AVFormatContext **output_files,
} else { } else {
char *logbuffer; char *logbuffer;
size_t logbuffer_size; size_t logbuffer_size;
if (read_file(logfilename, &logbuffer, &logbuffer_size) < 0) { if (cmdutils_read_file(logfilename, &logbuffer, &logbuffer_size) < 0) {
fprintf(stderr, "Error reading log file '%s' for pass-2 encoding\n", logfilename); fprintf(stderr, "Error reading log file '%s' for pass-2 encoding\n", logfilename);
exit_program(1); exit_program(1);
} }