virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavc: fix recoded subtitles end.

Browse Source 
Text subtitles packets are not 0-terminated (and if they are,
it is handled by the recoding process since 0 is a valid
Unicode code point). The terminating 0 would overwrite the
last payload octet.

OTOH, packets must be 0-padded.

Fix a problem reported in trac ticket #2431.
This commit is contained in:
Nicolas George 2013-04-07 09:48:57 +02:00
parent 38665efcc7
commit 0884d04dc3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/utils.c
View File

@ -2185,7 +2185,7 @@ static int recode_subtitle(AVCodecContext *avctx,
goto end; goto end;
} }
outpkt->size -= outl; outpkt->size -= outl;
outpkt->data[outpkt->size - 1] = '\0'; memset(outpkt->data + outpkt->size, 0, outl);
end: end:
if (cd != (iconv_t)-1) if (cd != (iconv_t)-1)

2
tests/ref/fate/sub-charenc
View File

@ -1 +1 @@
a39d7e299a8e25b4ffece0f8d64bf19e 9615088d613931b50fd5016c7535b99a