diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 17:13:45 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 17:13:45 +0400 |
| commit | 1885ffb03d0af28e6bac2bcc8725fa15b93f6ac9 (patch) | |
| tree | 192b6341b447e51b2121dc17509ce852fa36405b /libavcodec/pgssubdec.c | |
| parent | b91fa5fcca70bdf188b757084edd444d4d8530c9 (diff) | |
| parent | 9a07c1332cfe092b57b5758f22b686ca58806c60 (diff) | |
Merge commit '9a07c1332cfe092b57b5758f22b686ca58806c60'
* commit '9a07c1332cfe092b57b5758f22b686ca58806c60':
parser: Move Doxygen documentation to the header files
PGS subtitles: Expose forced flag
x86: PMINUB: port to cpuflags
Conflicts:
libavcodec/avcodec.h
libavcodec/pgssubdec.c
libavcodec/version.h
libavcodec/x86/ac3dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pgssubdec.c')
| -rw-r--r-- | libavcodec/pgssubdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c index d0d4dd6aff..2876c6ac32 100644 --- 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)); |