diff options
| author | mplayer-svn <svn@mplayerhq.hu> | 2011-10-27 19:58:42 +0000 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-08-03 01:32:20 +0200 |
| commit | 273d1ddd718a9f48ed9fef469ccdfbf11f0db8be (patch) | |
| tree | 315da58e98784562f2fb17cac93f01511db9eff4 | |
| parent | 1764bfacca7bd5031e4ba8aad0c53510d2651216 (diff) | |
| download | mpv-273d1ddd718a9f48ed9fef469ccdfbf11f0db8be.tar.bz2 mpv-273d1ddd718a9f48ed9fef469ccdfbf11f0db8be.tar.xz | |
demux_audio: ensure that demuxer->movi_end will be set
This also simplifies the code that checks for TAG.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34272 b3059339-0415-0410-9bf9-f77b7e298cf2
Author: ib
| -rw-r--r-- | libmpdemux/demux_audio.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c index bc14b530c1..e58bb55aae 100644 --- a/libmpdemux/demux_audio.c +++ b/libmpdemux/demux_audio.c @@ -329,6 +329,7 @@ static int demux_audio_open(demuxer_t* demuxer) { case MP3: sh_audio->format = (mp3_found->mpa_layer < 3 ? 0x50 : 0x55); demuxer->movi_start = mp3_found->frame_pos; + demuxer->movi_end = s->end_pos; next_frame_pos = mp3_found->next_frame_pos; sh_audio->audio.dwSampleSize= 0; sh_audio->audio.dwScale = mp3_found->mpa_spf; @@ -349,9 +350,7 @@ static int demux_audio_open(demuxer_t* demuxer) { stream_seek(s,s->end_pos-128); stream_read(s,tag,3); tag[3] = '\0'; - if(strcmp(tag,"TAG")) - demuxer->movi_end = s->end_pos; - else { + if(!strcmp(tag,"TAG")) { char buf[31]; uint8_t g; demuxer->movi_end = stream_tell(s)-3; |