diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 14:13:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 14:13:45 +0100 |
| commit | 1885ffb03d0af28e6bac2bcc8725fa15b93f6ac9 (patch) | |
| tree | 192b6341b447e51b2121dc17509ce852fa36405b /libavcodec/dvdsubdec.c | |
| parent | b91fa5fcca70bdf188b757084edd444d4d8530c9 (diff) | |
| parent | 9a07c1332cfe092b57b5758f22b686ca58806c60 (diff) | |
| download | ffmpeg-1885ffb03d0af28e6bac2bcc8725fa15b93f6ac9.tar.gz | |
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/dvdsubdec.c')
| -rw-r--r-- | libavcodec/dvdsubdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index 90593d0833..9c2dd8cf05 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -357,7 +357,7 @@ static int decode_dvd_subtitles(DVDSubContext *ctx, AVSubtitle *sub_header, sub_header->rects[0]->h = h; sub_header->rects[0]->type = SUBTITLE_BITMAP; sub_header->rects[0]->pict.linesize[0] = w; - sub_header->rects[0]->forced = is_menu; + sub_header->rects[0]->flags = is_menu ? AV_SUBTITLE_FLAG_FORCED : 0; } } if (next_cmd_pos < cmd_pos) { |