diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-01 05:02:20 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-01 05:02:20 +0400 |
commit | f955fdc7c6a8c651c9e67fb1f79d3f0b2f72df11 (patch) | |
tree | c82845c58f791e8f021a8c785d0a4d1a12eec3e7 /cmdutils.c | |
parent | 3e5ea9e471d8f08bfa0c6aa86241393a3d08066a (diff) | |
parent | 02170990fdb2a05c6eaf5fd449f440ec51c0f822 (diff) |
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>
Diffstat (limited to 'cmdutils.c')
-rw-r--r-- | cmdutils.c | 2 |
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"); |