MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/microdvd: skip BOM properly

Browse Source 
The BOM is already skipped in the probe function, but not the header
read function. This could cause the header to be misparsed, such as
not interpreting the FPS line.
This commit is contained in:
wm4 2014-03-02 22:36:41 +01:00 committed by Clément Bœsch
parent b79dfd16cb
commit 0786598f51
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/microdvddec.c
View File

@ -71,22 +71,29 @@ static int get_duration(const char *buf)
return -1;
}
static const char *bom = "\xEF\xBB\xBF";
static int microdvd_read_header(AVFormatContext *s)
{
AVRational pts_info = (AVRational){ 2997, 125 }; /* default: 23.976 fps */
MicroDVDContext *microdvd = s->priv_data;
AVStream *st = avformat_new_stream(s, NULL);
int i = 0;
char line[MAX_LINESIZE];
char line_buf[MAX_LINESIZE];
if (!st)
return AVERROR(ENOMEM);
while (!url_feof(s->pb)) {
char *p = line;
char *p;
AVPacket *sub;
int64_t pos = avio_tell(s->pb);
int len = ff_get_line(s->pb, line, sizeof(line));
int len = ff_get_line(s->pb, line_buf, sizeof(line_buf));
char *line = line_buf;
if (!strncmp(line, bom, 3))
line += 3;
p = line;
if (!len)
break;