generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert latin1 codec_name in mov to UTF-8, since all strings in FFmpeg

Browse Source 
must be valid UTF-8.

Originally committed as revision 20092 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger
2009-09-30 09:43:56 +00:00
parent 53f9f9c91b
commit 19635234b1
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/mov.c
View File

@@ -909,8 +909,13 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
get_buffer(pb, codec_name, 32); /* codec name, pascal string */ get_buffer(pb, codec_name, 32); /* codec name, pascal string */
if (codec_name[0] <= 31) { if (codec_name[0] <= 31) {
memcpy(st->codec->codec_name, &codec_name[1],codec_name[0]); int i;
st->codec->codec_name[codec_name[0]] = 0; int pos = 0;
for (i = 0; i < codec_name[0] && pos < sizeof(st->codec->codec_name) - 3; i++) {
uint8_t tmp;
PUT_UTF8(codec_name[i], tmp, st->codec->codec_name[pos++] = tmp;)
}
st->codec->codec_name[pos] = 0;
} }
st->codec->bits_per_coded_sample = get_be16(pb); /* depth */ st->codec->bits_per_coded_sample = get_be16(pb); /* depth */