highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  cmdutils: Rename read_file to cmdutils_read_file

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-11-01 02:02:20 +01:00
commit f955fdc7c6
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
avconv.c
View File

@ -2241,7 +2241,7 @@ static int transcode_init(OutputFile *output_files,
} else { } else {
char *logbuffer; char *logbuffer;
size_t logbuffer_size; size_t logbuffer_size;
if (read_file(logfilename, &logbuffer, &logbuffer_size) < 0) { if (cmdutils_read_file(logfilename, &logbuffer, &logbuffer_size) < 0) {
av_log(NULL, AV_LOG_FATAL, "Error reading log file '%s' for pass-2 encoding\n", av_log(NULL, AV_LOG_FATAL, "Error reading log file '%s' for pass-2 encoding\n",
logfilename); logfilename);
exit_program(1); exit_program(1);

2
cmdutils.c
View File

@ -807,7 +807,7 @@ int read_yesno(void)
return yesno; 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; int ret;
FILE *f = fopen(filename, "rb"); FILE *f = fopen(filename, "rb");

2
cmdutils.h
View File

@ -323,7 +323,7 @@ int read_yesno(void);
* @return 0 in case of success, a negative value corresponding to an * @return 0 in case of success, a negative value corresponding to an
* AVERROR error code in case of failure. * AVERROR error code in case of failure.
*/ */
int read_file(const char *filename, char **bufptr, size_t *size); int cmdutils_read_file(const char *filename, char **bufptr, size_t *size);
/** /**
* Get a file corresponding to a preset file. * Get a file corresponding to a preset file.

2
ffmpeg.c
View File

@ -2250,7 +2250,7 @@ static int transcode_init(OutputFile *output_files, int nb_output_files,
if (codec->flags & CODEC_FLAG_PASS2) { if (codec->flags & CODEC_FLAG_PASS2) {
char *logbuffer; char *logbuffer;
size_t logbuffer_size; size_t logbuffer_size;
if (read_file(logfilename, &logbuffer, &logbuffer_size) < 0) { if (cmdutils_read_file(logfilename, &logbuffer, &logbuffer_size) < 0) {
av_log(NULL, AV_LOG_FATAL, "Error reading log file '%s' for pass-2 encoding\n", av_log(NULL, AV_LOG_FATAL, "Error reading log file '%s' for pass-2 encoding\n",
logfilename); logfilename);
exit_program(1); exit_program(1);