From 02170990fdb2a05c6eaf5fd449f440ec51c0f822 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Mon, 7 Feb 2011 11:49:37 +0200 Subject: cmdutils: Rename read_file to cmdutils_read_file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This symbol name clashes with a symbol in gnutls, if linking statically to that library. Signed-off-by: Martin Storsjö --- cmdutils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmdutils.h') 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 -- cgit v1.2.3