diff options
| author | Martin Storsjö <martin@martin.st> | 2011-02-07 11:49:37 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2011-10-31 16:29:29 +0200 |
| commit | 02170990fdb2a05c6eaf5fd449f440ec51c0f822 (patch) | |
| tree | 8bef187629e410f5d4395af6f8b401603b4e1323 /cmdutils.h | |
| parent | 45235d69c271966409cdd3eaa022258c22e04fdb (diff) | |
| download | ffmpeg-02170990fdb2a05c6eaf5fd449f440ec51c0f822.tar.gz | |
cmdutils: Rename read_file to cmdutils_read_file
This symbol name clashes with a symbol in gnutls, if linking
statically to that library.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'cmdutils.h')
| -rw-r--r-- | cmdutils.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmdutils.h b/cmdutils.h index 80b20b8e06..55a06dd096 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -309,7 +309,7 @@ int read_yesno(void); * @return 0 in case of success, a negative value corresponding to an * 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 { int64_t num_faulty_pts; /// Number of incorrect PTS values so far |