Merge commit '9a07c1332cfe092b57b5758f22b686ca58806c60'

[ffmpeg] / libavcodec / pgssubdec.c

diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c
index d0d4dd6aff0bebd29ec77986ebdf4642dec49fa6..2876c6ac32112345665bd2862a1925f850da7dbf 100644 (file)
--- a/libavcodec/pgssubdec.c
+++ b/libavcodec/pgssubdec.c
@@ -429,7 +429,7 @@ static int display_end_segment(AVCodecContext *avctx, void *data,
         sub->rects[rect]->pict.data[1] = av_mallocz(AVPALETTE_SIZE);
 
         /* Copy the forced flag */
-        sub->rects[rect]->forced = (ctx->presentation.objects[rect].composition & 0x40) != 0;
+        sub->rects[rect]->flags = (ctx->presentation.objects[rect].composition & 0x40) != 0 ? AV_SUBTITLE_FLAG_FORCED : 0;
 
         if (!ctx->forced_subs_only || ctx->presentation.objects[rect].composition & 0x40)
         memcpy(sub->rects[rect]->pict.data[1], ctx->clut, sub->rects[rect]->nb_colors * sizeof(uint32_t));