Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cmdutils: Rename read_file to cmdutils_read_file

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 1 insertions, 1 deletions

diff --git a/cmdutils.c b/cmdutils.c
index 30104fd6b9..76ec5b665a 100644
--- 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");