From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 17 Feb 2015 22:12:29 +0000 (+0100)
Subject: Merge commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=d128794fbc5eb5df9645d7e5fefc66abb3c701b5;p=ffmpeg

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>
---

d128794fbc5eb5df9645d7e5fefc66abb3c701b5
diff --cc libavcodec/libxvid_rc.c
index ac154aa6054,26f3c495c1d..0fd030c706e
--- a/libavcodec/libxvid_rc.c
+++ b/libavcodec/libxvid_rc.c
@@@ -46,10 -79,10 +46,10 @@@ av_cold int ff_xvid_rate_control_init(M
      xvid_plg_create_t xvid_plg_create = { 0 };
      xvid_plugin_2pass2_t xvid_2pass2  = { 0 };
  
 -    fd = ff_tempfile("xvidrc.", &tmp_name);
 +    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++) {