diff options
-rw-r--r-- | apps/codecs/ape.c | 2 | ||||
-rw-r--r-- | apps/codecs/speex.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/apps/codecs/ape.c b/apps/codecs/ape.c index 6c829c3863..ef3d94e1a3 100644 --- a/apps/codecs/ape.c +++ b/apps/codecs/ape.c | |||
@@ -281,7 +281,7 @@ frame_start: | |||
281 | blockstodecode)) < 0) | 281 | blockstodecode)) < 0) |
282 | { | 282 | { |
283 | /* Frame decoding error, abort */ | 283 | /* Frame decoding error, abort */ |
284 | LOGF("APE: Frame %d, error %d\n",currentframe,res); | 284 | LOGF("APE: Frame %lu, error %d\n",currentframe,res); |
285 | retval = CODEC_ERROR; | 285 | retval = CODEC_ERROR; |
286 | goto done; | 286 | goto done; |
287 | } | 287 | } |
diff --git a/apps/codecs/speex.c b/apps/codecs/speex.c index 91dce9ef01..52f4239652 100644 --- a/apps/codecs/speex.c +++ b/apps/codecs/speex.c | |||
@@ -117,7 +117,7 @@ static spx_int64_t seek_backwards(spx_ogg_sync_state *oy, spx_ogg_page *og, | |||
117 | begin = 0; | 117 | begin = 0; |
118 | time++; | 118 | time++; |
119 | } else { | 119 | } else { |
120 | LOGF("Can't seek that early:%d\n",begin); | 120 | LOGF("Can't seek that early:%lld\n",begin); |
121 | return -3; /* too early */ | 121 | return -3; /* too early */ |
122 | } | 122 | } |
123 | } | 123 | } |
@@ -156,7 +156,7 @@ static spx_int64_t seek_backwards(spx_ogg_sync_state *oy, spx_ogg_page *og, | |||
156 | 156 | ||
157 | } else if (lastgranule > wantedpos) { /*too late, seek more*/ | 157 | } else if (lastgranule > wantedpos) { /*too late, seek more*/ |
158 | if (offset != -1) { | 158 | if (offset != -1) { |
159 | LOGF("Toolate, returnanyway:%d,%d,%d,%d\n", | 159 | LOGF("Toolate, returnanyway:%lld,%lld,%lld,%lld\n", |
160 | ret,lastgranule,wantedpos,avgpagelen); | 160 | ret,lastgranule,wantedpos,avgpagelen); |
161 | return ret; | 161 | return ret; |
162 | } | 162 | } |
@@ -221,7 +221,7 @@ static int speex_seek_page_granule(spx_int64_t pos, spx_int64_t curpos, | |||
221 | offset = get_next_page(oy,&og,-1); | 221 | offset = get_next_page(oy,&og,-1); |
222 | 222 | ||
223 | if (offset < 0) { /* could not find new page,use old offset */ | 223 | if (offset < 0) { /* could not find new page,use old offset */ |
224 | LOGF("Seek/guess/fault:%d->-<-%d,%d:%d,%d,%d\n", | 224 | LOGF("Seek/guess/fault:%lld->-<-%d,%lld:%lld,%d,%ld,%d\n", |
225 | curpos,0,pos,offset,0, | 225 | curpos,0,pos,offset,0, |
226 | ci->curpos,/*stream_length*/0); | 226 | ci->curpos,/*stream_length*/0); |
227 | 227 | ||
@@ -232,7 +232,7 @@ static int speex_seek_page_granule(spx_int64_t pos, spx_int64_t curpos, | |||
232 | spx_ogg_sync_reset(oy); | 232 | spx_ogg_sync_reset(oy); |
233 | } else { | 233 | } else { |
234 | if (spx_ogg_page_granulepos(&og) == 0 && pos > 5000) { | 234 | if (spx_ogg_page_granulepos(&og) == 0 && pos > 5000) { |
235 | LOGF("SEEK/guess/fault:%d->-<-%d,%d:%d,%d,%d\n", | 235 | LOGF("SEEK/guess/fault:%lld->-<-%lld,%lld:%lld,%d,%ld,%d\n", |
236 | curpos,spx_ogg_page_granulepos(&og),pos, | 236 | curpos,spx_ogg_page_granulepos(&og),pos, |
237 | offset,0,ci->curpos,/*stream_length*/0); | 237 | offset,0,ci->curpos,/*stream_length*/0); |
238 | 238 | ||
@@ -287,7 +287,7 @@ static int speex_seek_page_granule(spx_int64_t pos, spx_int64_t curpos, | |||
287 | 287 | ||
288 | spx_ogg_sync_reset(oy); | 288 | spx_ogg_sync_reset(oy); |
289 | 289 | ||
290 | LOGF("Seek failed:%d\n", offset); | 290 | LOGF("Seek failed:%lld\n", offset); |
291 | 291 | ||
292 | return -1; | 292 | return -1; |
293 | } | 293 | } |
@@ -421,7 +421,7 @@ next_track: | |||
421 | /*seek (seeks to the page before the position) */ | 421 | /*seek (seeks to the page before the position) */ |
422 | if (ci->seek_time) { | 422 | if (ci->seek_time) { |
423 | if(samplerate!=0&&packet_count>1){ | 423 | if(samplerate!=0&&packet_count>1){ |
424 | LOGF("Speex seek page:%d,%d,%d,%d\n", | 424 | LOGF("Speex seek page:%lld,%lld,%ld,%lld,%d\n", |
425 | ((spx_int64_t)ci->seek_time/1000) * | 425 | ((spx_int64_t)ci->seek_time/1000) * |
426 | (spx_int64_t)samplerate, | 426 | (spx_int64_t)samplerate, |
427 | page_granule, ci->seek_time, | 427 | page_granule, ci->seek_time, |