Browse code

Merge commit 'c63dd3f0a48a9f6389d253597ab51caddc0118db'

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

Conflicts:
libavcodec/a64multienc.c

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

Michael Niedermayer authored on 2014/12/19 12:21:13
Showing 1 changed files
... ...
@@ -340,8 +340,14 @@ static int a64multi_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
340 340
             buf = pkt->data;
341 341
 
342 342
             /* calc optimal new charset + charmaps */
343
-            avpriv_init_elbg(meta, 32, 1000 * c->mc_lifetime, best_cb, CHARSET_CHARS, 50, charmap, &c->randctx);
344
-            avpriv_do_elbg  (meta, 32, 1000 * c->mc_lifetime, best_cb, CHARSET_CHARS, 50, charmap, &c->randctx);
343
+            ret = avpriv_init_elbg(meta, 32, 1000 * c->mc_lifetime, best_cb,
344
+                               CHARSET_CHARS, 50, charmap, &c->randctx);
345
+            if (ret < 0)
346
+                return ret;
347
+            ret = avpriv_do_elbg(meta, 32, 1000 * c->mc_lifetime, best_cb,
348
+                             CHARSET_CHARS, 50, charmap, &c->randctx);
349
+            if (ret < 0)
350
+                return ret;
345 351
 
346 352
             /* create colorram map and a c64 readable charset */
347 353
             render_charset(avctx, charset, colram);