RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavf/bit: Fix the G.729 bit auto-detection.

This commit is contained in:
Carl Eugen Hoyos 2017-09-29 19:10:46 +02:00
parent 67057aaeb2
commit e9f9175db6
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavformat/bit.c
View File

@ -32,20 +32,23 @@
#if CONFIG_BIT_DEMUXER
static int probe(AVProbeData *p)
{
int i, j;
int i = 0, j, valid = 0;
if(p->buf_size < 0x40)
return 0;
for(i=0; i+3<p->buf_size && i< 10*0x50; ){
if(AV_RL16(&p->buf[0]) != SYNC_WORD)
while (2 * i + 3 < p->buf_size){
if (AV_RL16(&p->buf[2 * i++]) != SYNC_WORD)
return 0;
j=AV_RL16(&p->buf[2]);
if(j!=0x40 && j!=0x50)
j = AV_RL16(&p->buf[2 * i++]);
if (j != 0 && j != 0x10 && j != 0x40 && j != 0x50 && j != 0x76)
return 0;
i+=j;
if (j)
valid++;
i += j;
}
return AVPROBE_SCORE_EXTENSION;
if (valid > 10)
return AVPROBE_SCORE_MAX;
if (valid > 2)
return AVPROBE_SCORE_EXTENSION - 1;
return 0;
}
static int read_header(AVFormatContext *s)