diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 13:33:44 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 13:33:44 +0200 |
commit | edd110ee4526849da487bb6be9c63fc77cb5a65a (patch) | |
tree | 4c0b9bd163f24be2ede535cc91dc6382bc006b24 /cmdutils.c | |
parent | 247f4d1f181c2801b8321a7ddb88818dc4861155 (diff) | |
parent | bd2ab27c488ae92c7820efe11d4f53d84e94d58e (diff) |
Merge commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e'
* commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e':
avconv: use read_file() for reading the 2pass stats
Conflicts:
cmdutils.c
cmdutils.h
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'cmdutils.c')
-rw-r--r-- | cmdutils.c | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/cmdutils.c b/cmdutils.c index 6e7a0bb09b..15b1bccd44 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -1875,64 +1875,6 @@ int read_yesno(void) return yesno; } -int cmdutils_read_file(const char *filename, char **bufptr, size_t *size) -{ - int64_t ret; - FILE *f = av_fopen_utf8(filename, "rb"); - - if (!f) { - ret = AVERROR(errno); - av_log(NULL, AV_LOG_ERROR, "Cannot read file '%s': %s\n", filename, - strerror(errno)); - return ret; - } - - ret = fseek(f, 0, SEEK_END); - if (ret == -1) { - ret = AVERROR(errno); - goto out; - } - - ret = ftell(f); - if (ret < 0) { - ret = AVERROR(errno); - goto out; - } - *size = ret; - - ret = fseek(f, 0, SEEK_SET); - if (ret == -1) { - ret = AVERROR(errno); - goto out; - } - - *bufptr = av_malloc(*size + 1); - if (!*bufptr) { - av_log(NULL, AV_LOG_ERROR, "Could not allocate file buffer\n"); - ret = AVERROR(ENOMEM); - goto out; - } - ret = fread(*bufptr, 1, *size, f); - if (ret < *size) { - av_free(*bufptr); - if (ferror(f)) { - ret = AVERROR(errno); - av_log(NULL, AV_LOG_ERROR, "Error while reading file '%s': %s\n", - filename, strerror(errno)); - } else - ret = AVERROR_EOF; - } else { - ret = 0; - (*bufptr)[(*size)++] = '\0'; - } - -out: - if (ret < 0) - av_log(NULL, AV_LOG_ERROR, "IO error: %s\n", av_err2str(ret)); - fclose(f); - return ret; -} - FILE *get_preset_file(char *filename, size_t filename_size, const char *preset_name, int is_path, const char *codec_name) |