Merge commit 'c63dd3f0a48a9f6389d253597ab51caddc0118db'

* commit 'c63dd3f0a48a9f6389d253597ab51caddc0118db':
  a64multi: check elbg return values

Conflicts:
	libavcodec/a64multienc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/a64multienc.c
index fc00d3fc627c5224d318e391e72a0b25754a4445,d742deeaf70c3181ffdc982db49cee1506767335..6438c27fd50aab3de2105bdbfbb57843a589235b
--- 1/libavcodec/a64multienc.c
--- 2/libavcodec/a64multienc.c
+++ b/libavcodec/a64multienc.c
@@@ -340,8 -320,15 +340,14 @@@ static int a64multi_encode_frame(AVCode
              buf = pkt->data;
  
              /* calc optimal new charset + charmaps */
-             avpriv_init_elbg(meta, 32, 1000 * c->mc_lifetime, best_cb, CHARSET_CHARS, 50, charmap, &c->randctx);
-             avpriv_do_elbg  (meta, 32, 1000 * c->mc_lifetime, best_cb, CHARSET_CHARS, 50, charmap, &c->randctx);
 -            ret = ff_init_elbg(meta, 32, 1000 * c->mc_lifetime, best_cb,
++            ret = avpriv_init_elbg(meta, 32, 1000 * c->mc_lifetime, best_cb,
+                                CHARSET_CHARS, 50, charmap, &c->randctx);
+             if (ret < 0)
+                 return ret;
 -            ret = ff_do_elbg(meta, 32, 1000 * c->mc_lifetime, best_cb,
++            ret = avpriv_do_elbg(meta, 32, 1000 * c->mc_lifetime, best_cb,
+                              CHARSET_CHARS, 50, charmap, &c->randctx);
+             if (ret < 0)
+                 return ret;
  
              /* create colorram map and a c64 readable charset */
              render_charset(avctx, charset, colram);