lavc: override decode return value only in case of error

Fixes Ticket #5350 Regression since 2941282124.
9 years ago · bbf02f7d28
parent 532e937083
commit bbf02f7d28
1 changed files with 3 additions and 1 deletions
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@ -2633,7 +2633,9 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub,
                && *got_sub_ptr && sub->num_rects) {
                const AVRational tb = avctx->pkt_timebase.num ? avctx->pkt_timebase
                                                              : avctx->time_base;
-                ret = convert_sub_to_old_ass_form(sub, avpkt, tb);
+                int err = convert_sub_to_old_ass_form(sub, avpkt, tb);
+                if (err < 0)
+                    ret = err;
            }
 #endif