diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 23:12:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 23:13:12 +0100 |
| commit | d128794fbc5eb5df9645d7e5fefc66abb3c701b5 (patch) | |
| tree | c3beb871cf4e72a4a3d716f70d6290cf609c7f65 | |
| parent | 2e786bc4989835f6d82cc187c4bb37716521a0bf (diff) | |
| parent | a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012 (diff) | |
| download | ffmpeg-d128794fbc5eb5df9645d7e5fefc66abb3c701b5.tar.gz | |
Merge commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012'
* commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012':
libxvid: Return meaningful error messages
Conflicts:
libavcodec/libxvid.c
libavcodec/libxvid_rc.c
See: 2a89afb376aebe833bee0b5958cec16c48936b03 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/libxvid_rc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/libxvid_rc.c b/libavcodec/libxvid_rc.c index ac154aa605..0fd030c706 100644 --- a/libavcodec/libxvid_rc.c +++ b/libavcodec/libxvid_rc.c @@ -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++) { |