virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

lavc: override decode return value only in case of error

Browse Source 
Fixes Ticket #5350

Regression since 2941282124.
This commit is contained in:
Clément Bœsch
2016-05-01 14:53:53 +02:00
parent 532e937083
commit bbf02f7d28
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/utils.c
View File

@@ -2633,7 +2633,9 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub,
&& *got_sub_ptr && sub->num_rects) { && *got_sub_ptr && sub->num_rects) {
const AVRational tb = avctx->pkt_timebase.num ? avctx->pkt_timebase const AVRational tb = avctx->pkt_timebase.num ? avctx->pkt_timebase
: avctx->time_base; : 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 #endif