RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012' 

* commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012':
  libxvid: Return meaningful error messages

Conflicts:
	libavcodec/libxvid.c
	libavcodec/libxvid_rc.c

See: 2a89afb376 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-17 23:12:29 +01:00
parent 2e786bc498 a1e2c47cd4
commit d128794fbc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/libxvid_rc.c
View File

@ -47,9 +47,9 @@ av_cold int ff_xvid_rate_control_init(MpegEncContext *s)
xvid_plugin_2pass2_t xvid_2pass2 = { 0 };
fd = av_tempfile("xvidrc.", &tmp_name, 0, s->avctx);
if (fd == -1) {
if (fd < 0) {
av_log(NULL, AV_LOG_ERROR, "Can't create temporary pass2 file.\n");
return -1;
return fd;
}
for (i = 0; i < s->rc_context.num_entries; i++) {