summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_audio.c
diff options
context:
space:
mode:
Diffstat (limited to 'libmpdemux/demux_audio.c')
-rw-r--r--libmpdemux/demux_audio.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c
index da395fb611..d9ea6f2f84 100644
--- a/libmpdemux/demux_audio.c
+++ b/libmpdemux/demux_audio.c
@@ -168,7 +168,7 @@ get_flac_metadata (demuxer_t* demuxer)
uint8_t preamble[4];
unsigned int blk_len;
stream_t *s = demuxer->stream;
-
+
/* file is qualified; skip over the signature bytes in the stream */
stream_seek (s, 4);
@@ -176,7 +176,7 @@ get_flac_metadata (demuxer_t* demuxer)
* will always be 1 metadata block */
do {
int r;
-
+
r = stream_read (s, (char *) preamble, FLAC_SIGNATURE_SIZE);
if (r != FLAC_SIGNATURE_SIZE)
return;
@@ -250,7 +250,7 @@ get_flac_metadata (demuxer_t* demuxer)
case FLAC_APPLICATION:
case FLAC_SEEKTABLE:
case FLAC_CUESHEET:
- default:
+ default:
/* 6-127 are presently reserved */
stream_skip (s, blk_len);
break;
@@ -268,7 +268,7 @@ static int demux_audio_open(demuxer_t* demuxer) {
// mp3_hdrs list is sorted first by next_frame_pos and then by frame_pos
mp3_hdr_t *mp3_hdrs = NULL, *mp3_found = NULL;
da_priv_t* priv;
-
+
s = demuxer->stream;
stream_read(s, hdr, HDR_SIZE);
@@ -299,7 +299,7 @@ static int demux_audio_open(demuxer_t* demuxer) {
step = 4;
} else if( hdr[0] == 'f' && hdr[1] == 'm' && hdr[2] == 't' && hdr[3] == ' ' ) {
frmt = WAV;
- break;
+ break;
} else if((mp3_flen = mp_get_mp3_header(hdr, &mp3_chans, &mp3_freq,
&mpa_spf, &mpa_layer, &mpa_br)) > 0) {
mp3_found = add_mp3_hdr(&mp3_hdrs, st_pos, mp3_chans, mp3_freq,
@@ -342,7 +342,7 @@ static int demux_audio_open(demuxer_t* demuxer) {
sh_audio->wf->nAvgBytesPerSec = mp3_found->mpa_br * (1000 / 8);
sh_audio->wf->nBlockAlign = mp3_found->mpa_spf;
sh_audio->wf->wBitsPerSample = 16;
- sh_audio->wf->cbSize = 0;
+ sh_audio->wf->cbSize = 0;
sh_audio->i_bps = sh_audio->wf->nAvgBytesPerSec;
free(mp3_found);
mp3_found = NULL;
@@ -655,7 +655,7 @@ static void demux_audio_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_
pos = demuxer->movi_start;
priv->next_pts = (pos-demuxer->movi_start)/(double)sh_audio->i_bps;
-
+
switch(priv->frmt) {
case WAV:
pos -= (pos - demuxer->movi_start) %
@@ -679,7 +679,7 @@ static int demux_audio_control(demuxer_t *demuxer,int cmd, void *arg){
sh_audio_t *sh_audio=demuxer->audio->sh;
int audio_length = sh_audio->i_bps ? demuxer->movi_end / sh_audio->i_bps : 0;
da_priv_t* priv = demuxer->priv;
-
+
switch(cmd) {
case DEMUXER_CTRL_GET_TIME_LENGTH:
if (audio_length<=0) return DEMUXER_CTRL_DONTKNOW;
@@ -687,7 +687,7 @@ static int demux_audio_control(demuxer_t *demuxer,int cmd, void *arg){
return DEMUXER_CTRL_GUESS;
case DEMUXER_CTRL_GET_PERCENT_POS:
- if (audio_length<=0)
+ if (audio_length<=0)
return DEMUXER_CTRL_DONTKNOW;
*((int *)arg)=(int)( (priv->next_pts*100) / audio_length);
return DEMUXER_CTRL_OK;