* commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e': avconv: use read_file() for reading the 2pass stats Conflicts: cmdutils.c cmdutils.h ffmpeg_opt.c
Showing the changes to cmdutils.h (1 of 3 files). Show all
Unified · Split
| @@ -529,18 +529,6 @@ int show_colors(void *optctx, const char *opt, const char *arg); · 528 unmodified lines | |||
| 529 | */ | 529 | */ |
| 530 | int read_yesno(void); | 530 | int read_yesno(void); |
| 531 | 531 | ||
| 532 | /** | ||
| 533 | * Read the file with name filename, and put its content in a newly | ||
| 534 | * allocated 0-terminated buffer. | ||
| 535 | * | ||
| 536 | * @param filename file to read from | ||
| 537 | * @param bufptr location where pointer to buffer is returned | ||
| 538 | * @param size location where size of buffer is returned | ||
| 539 | * @return >= 0 in case of success, a negative value corresponding to an | ||
| 540 | * AVERROR error code in case of failure. | ||
| 541 | */ | ||
| 542 | int cmdutils_read_file(const char *filename, char **bufptr, size_t *size); | ||
| 543 | |||
| 544 | /** | 532 | /** |
| 545 | * Get a file corresponding to a preset file. | 533 | * Get a file corresponding to a preset file. |
| 546 | * | 534 | * |