Merge remote-tracking branch 'qatar/master'

[ffmpeg] / cmdutils.h

diff --git a/cmdutils.h b/cmdutils.h
index 6d2e82b4ebc926ba7e913b8df8b32394e91189ec..3544cdb9f07e827eaf956dfaa02634f8482fde72 100644 (file)
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -323,7 +323,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);
 
 /**
  * Get a file corresponding to a preset file.