Mercurial > mplayer.hg
comparison libmpdemux/demux_audio.c @ 24591:1966dc28e5a5
Get rid of rather pointless asserts
author | reimar |
---|---|
date | Mon, 24 Sep 2007 22:18:47 +0000 |
parents | 9118be6575da |
children | 664366177d29 |
comparison
equal
deleted
inserted
replaced
24590:2c238fa777ff | 24591:1966dc28e5a5 |
---|---|
11 #include "genres.h" | 11 #include "genres.h" |
12 #include "mp3_hdr.h" | 12 #include "mp3_hdr.h" |
13 #include "libavutil/intreadwrite.h" | 13 #include "libavutil/intreadwrite.h" |
14 | 14 |
15 #include <string.h> | 15 #include <string.h> |
16 #ifdef MP_DEBUG | |
17 #include <assert.h> | |
18 #endif | |
19 | 16 |
20 #define MP3 1 | 17 #define MP3 1 |
21 #define WAV 2 | 18 #define WAV 2 |
22 #define fLaC 3 | 19 #define fLaC 3 |
23 | 20 |
282 int frmt = 0, n = 0, step; | 279 int frmt = 0, n = 0, step; |
283 off_t st_pos = 0, next_frame_pos = 0; | 280 off_t st_pos = 0, next_frame_pos = 0; |
284 // mp3_hdrs list is sorted first by next_frame_pos and then by frame_pos | 281 // mp3_hdrs list is sorted first by next_frame_pos and then by frame_pos |
285 mp3_hdr_t *mp3_hdrs = NULL, *mp3_found = NULL; | 282 mp3_hdr_t *mp3_hdrs = NULL, *mp3_found = NULL; |
286 da_priv_t* priv; | 283 da_priv_t* priv; |
287 #ifdef MP_DEBUG | |
288 assert(demuxer != NULL); | |
289 assert(demuxer->stream != NULL); | |
290 #endif | |
291 | 284 |
292 s = demuxer->stream; | 285 s = demuxer->stream; |
293 | 286 |
294 stream_read(s, hdr, HDR_SIZE); | 287 stream_read(s, hdr, HDR_SIZE); |
295 while(n < 30000 && !s->eof) { | 288 while(n < 30000 && !s->eof) { |
555 demux_packet_t* dp; | 548 demux_packet_t* dp; |
556 sh_audio_t* sh_audio; | 549 sh_audio_t* sh_audio; |
557 demuxer_t* demux; | 550 demuxer_t* demux; |
558 da_priv_t* priv; | 551 da_priv_t* priv; |
559 stream_t* s; | 552 stream_t* s; |
560 #ifdef MP_DEBUG | |
561 assert(ds != NULL); | |
562 assert(ds->sh != NULL); | |
563 assert(ds->demuxer != NULL); | |
564 #endif | |
565 sh_audio = ds->sh; | 553 sh_audio = ds->sh; |
566 demux = ds->demuxer; | 554 demux = ds->demuxer; |
567 priv = demux->priv; | 555 priv = demux->priv; |
568 s = demux->stream; | 556 s = demux->stream; |
569 | 557 |