Mercurial > mplayer.hg

comparison libmpdemux/demux_mkv.c @ 31176:04c61b9e94c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove two pointless void* casts.
author diego
date Thu, 27 May 2010 16:13:53 +0000
parents 6c7b07731503
children 9175a9a22051
comparison
equal deleted inserted replaced
31175:6c7b07731503 31176:04c61b9e94c8
1961 free(sh_a->wf); 1961 free(sh_a->wf);
1962 sh_a->wf = NULL; 1962 sh_a->wf = NULL;
1963 1963
1964 if (track->a_formattag == mmioFOURCC('f', 'L', 'a', 'C')) 1964 if (track->a_formattag == mmioFOURCC('f', 'L', 'a', 'C'))
1965 { 1965 {
1966 ptr = (unsigned char *)track->private_data; 1966 ptr = track->private_data;
1967 size = track->private_size; 1967 size = track->private_size;
1968 } 1968 }
1969 else 1969 else
1970 { 1970 {
1971 sh_a->format = mmioFOURCC('f', 'L', 'a', 'C'); 1971 sh_a->format = mmioFOURCC('f', 'L', 'a', 'C');
1972 ptr = (unsigned char *) track->private_data 1972 ptr = track->private_data + sizeof (WAVEFORMATEX);
1973 + sizeof (WAVEFORMATEX);
1974 size = track->private_size - sizeof (WAVEFORMATEX); 1973 size = track->private_size - sizeof (WAVEFORMATEX);
1975 } 1974 }
1976 if (size < 4 || ptr[0] != 'f' || ptr[1] != 'L' || 1975 if (size < 4 || ptr[0] != 'f' || ptr[1] != 'L' ||
1977 ptr[2] != 'a' || ptr[3] != 'C') 1976 ptr[2] != 'a' || ptr[3] != 'C')
1978 { 1977 {