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.h | |
| parent | 247f4d1f181c2801b8321a7ddb88818dc4861155 (diff) | |
| parent | bd2ab27c488ae92c7820efe11d4f53d84e94d58e (diff) | |
| download | ffmpeg-edd110ee4526849da487bb6be9c63fc77cb5a65a.tar.gz | |
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.h')
| -rw-r--r-- | cmdutils.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/cmdutils.h b/cmdutils.h index a21ce35fa8..55134ff27b 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -530,18 +530,6 @@ int show_colors(void *optctx, const char *opt, const char *arg); int read_yesno(void); /** - * Read the file with name filename, and put its content in a newly - * allocated 0-terminated buffer. - * - * @param filename file to read from - * @param bufptr location where pointer to buffer is returned - * @param size location where size of buffer is returned - * @return >= 0 in case of success, a negative value corresponding to an - * AVERROR error code in case of failure. - */ -int cmdutils_read_file(const char *filename, char **bufptr, size_t *size); - -/** * Get a file corresponding to a preset file. * * If is_path is non-zero, look for the file in the path preset_name. |