Merge remote-tracking branch 'qatar/master'

[ffmpeg] / cmdutils.c

diff --git a/cmdutils.c b/cmdutils.c
index 30104fd6b97db223b21b51626f4a1ad220674dd6..76ec5b665a800037143810f585e40be95f53f250 100644 (file)
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -807,7 +807,7 @@ int read_yesno(void)
     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;
     FILE *f = fopen(filename, "rb");