Changeset 3ccefd743ac2497a40acf007ba1a4d041b81d2a8
- Timestamp:
- 07/03/08 19:47:02
(2 months ago)
- Author:
- Rémi Denis-Courmont <rdenis@simphalempin.com>
- git-committer:
- Rémi Denis-Courmont <rdenis@simphalempin.com> 1215107222 +0300
- git-parent:
[266960857417c80ac2ab8c39ae2745361551ea45]
- git-author:
- Rémi Denis-Courmont <rdenis@simphalempin.com> 1215106761 +0300
- Message:
Format string fixes
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| rb674dab |
r3ccefd7 |
|
| 1630 | 1630 | if( i_correction_delta > p_sys->i_audio_max_frame_size ) |
|---|
| 1631 | 1631 | { |
|---|
| 1632 | | msg_Warn( p_demux, "ALSA read overrun (%d > %d)", |
|---|
| | 1632 | msg_Warn( p_demux, "ALSA read overrun (%zu > %zu)", |
|---|
| 1633 | 1633 | i_correction_delta, p_sys->i_audio_max_frame_size ); |
|---|
| 1634 | 1634 | i_correction_delta = p_sys->i_audio_max_frame_size; |
|---|
| r3561b9b |
r3ccefd7 |
|
| 145 | 145 | if (len > delta) |
|---|
| 146 | 146 | { |
|---|
| 147 | | msg_Dbg (access, "reading %u bytes instead of %u", (unsigned)delta, |
|---|
| | 147 | msg_Dbg (access, "reading %"PRIu64" bytes instead of %zu", delta, |
|---|
| 148 | 148 | len); |
|---|
| 149 | 149 | len = (int)delta; |
|---|
| r3561b9b |
r3ccefd7 |
|
| 203 | 203 | p_sys->i_block = (p_sys->codec == ADPCM_IMA_QT) ? |
|---|
| 204 | 204 | 34 * p_dec->fmt_in.audio.i_channels : 1024; |
|---|
| 205 | | msg_Warn( p_dec, "block size undefined, using %d", p_sys->i_block ); |
|---|
| | 205 | msg_Warn( p_dec, "block size undefined, using %zu", p_sys->i_block ); |
|---|
| 206 | 206 | } |
|---|
| 207 | 207 | else |
|---|
| r37402ad |
r3ccefd7 |
|
| 294 | 294 | { |
|---|
| 295 | 295 | if( i_used < 0 ) |
|---|
| 296 | | msg_Warn( p_dec, "cannot decode one frame (%d bytes)", |
|---|
| | 296 | msg_Warn( p_dec, "cannot decode one frame (%zu bytes)", |
|---|
| 297 | 297 | p_block->i_buffer ); |
|---|
| 298 | 298 | |
|---|
| r3561b9b |
r3ccefd7 |
|
| 155 | 155 | if( i_status < 0 ) |
|---|
| 156 | 156 | { |
|---|
| 157 | | msg_Warn( p_dec, "cannot decode one frame (%d bytes)", |
|---|
| | 157 | msg_Warn( p_dec, "cannot decode one frame (%zu bytes)", |
|---|
| 158 | 158 | p_block->i_buffer ); |
|---|
| 159 | 159 | block_Release( p_block ); |
|---|
| r3561b9b |
r3ccefd7 |
|
| 221 | 221 | if( p_block->i_buffer < SPU_HEADER_LEN ) |
|---|
| 222 | 222 | { |
|---|
| 223 | | msg_Dbg( p_dec, "invalid packet header (size %d < %d)" , |
|---|
| | 223 | msg_Dbg( p_dec, "invalid packet header (size %zu < %u)" , |
|---|
| 224 | 224 | p_block->i_buffer, SPU_HEADER_LEN ); |
|---|
| 225 | 225 | block_Release( p_block ); |
|---|
| … | … | |
| 254 | 254 | if( p_spu->i_buffer != p_sys->i_spu_size ) |
|---|
| 255 | 255 | { |
|---|
| 256 | | msg_Warn( p_dec, "SPU packets size=%d should be %d", |
|---|
| | 256 | msg_Warn( p_dec, "SPU packets size=%zu should be %zu", |
|---|
| 257 | 257 | p_spu->i_buffer, p_sys->i_spu_size ); |
|---|
| 258 | 258 | } |
|---|
| 259 | 259 | |
|---|
| 260 | | msg_Dbg( p_dec, "subtitle packet complete, size=%d", p_spu->i_buffer); |
|---|
| | 260 | msg_Dbg( p_dec, "subtitle packet complete, size=%zuu", p_spu->i_buffer); |
|---|
| 261 | 261 | |
|---|
| 262 | 262 | ParseMetaInfo( p_dec, p_spu ); |
|---|
| … | … | |
| 316 | 316 | |
|---|
| 317 | 317 | #ifdef DEBUG_CVDSUB |
|---|
| 318 | | msg_Dbg( p_dec, "total size: %d image size: %d", |
|---|
| | 318 | msg_Dbg( p_dec, "total size: %zu image size: %zu", |
|---|
| 319 | 319 | p_sys->i_spu_size, p_sys->i_image_length ); |
|---|
| 320 | 320 | #endif |
|---|
| … | … | |
| 462 | 462 | (p[2] << 8) + p[3] - p_sys->i_image_offset; |
|---|
| 463 | 463 | #ifdef DEBUG_CVDSUB |
|---|
| 464 | | msg_Dbg( p_dec, "1st_field_offset %d", p_sys->first_field_offset ); |
|---|
| | 464 | msg_Dbg( p_dec, "1st_field_offset %zu", |
|---|
| | 465 | p_sys->first_field_offset ); |
|---|
| 465 | 466 | #endif |
|---|
| 466 | 467 | break; |
|---|
| … | … | |
| 472 | 473 | (p[2] << 8) + p[3] - p_sys->i_image_offset; |
|---|
| 473 | 474 | #ifdef DEBUG_CVDSUB |
|---|
| 474 | | msg_Dbg( p_dec, "2nd_field_offset %d", p_sys->second_field_offset); |
|---|
| | 475 | msg_Dbg( p_dec, "2nd_field_offset %zu", |
|---|
| | 476 | p_sys->second_field_offset); |
|---|
| 475 | 477 | #endif |
|---|
| 476 | 478 | break; |
|---|
| r3561b9b |
r3ccefd7 |
|
| 230 | 230 | if( p_block->i_buffer < p_sys->i_raw_size ) |
|---|
| 231 | 231 | { |
|---|
| 232 | | msg_Warn( p_dec, "invalid frame size (%d < %d)", |
|---|
| | 232 | msg_Warn( p_dec, "invalid frame size (%zu < %zu)", |
|---|
| 233 | 233 | p_block->i_buffer, p_sys->i_raw_size ); |
|---|
| 234 | 234 | |
|---|
| r3561b9b |
r3ccefd7 |
|
| 207 | 207 | { |
|---|
| 208 | 208 | msg_Dbg( p_dec, "invalid starting packet (size < 4 or pts <=0)" ); |
|---|
| 209 | | msg_Dbg( p_dec, "spu size: %d, i_pts: %"PRId64" i_buffer: %d", |
|---|
| | 209 | msg_Dbg( p_dec, "spu size: %d, i_pts: %"PRId64" i_buffer: %zu", |
|---|
| 210 | 210 | p_sys->i_spu_size, p_block->i_pts, p_block->i_buffer ); |
|---|
| 211 | 211 | block_Release( p_block ); |
|---|
| r3561b9b |
r3ccefd7 |
|
| 262 | 262 | if( p_block->i_buffer < SPU_HEADER_LEN ) |
|---|
| 263 | 263 | { |
|---|
| 264 | | msg_Dbg( p_dec, "invalid packet header (size %d < %d)" , |
|---|
| | 264 | msg_Dbg( p_dec, "invalid packet header (size %zu < %u)" , |
|---|
| 265 | 265 | p_block->i_buffer, SPU_HEADER_LEN ); |
|---|
| 266 | 266 | block_Release( p_block ); |
|---|
| … | … | |
| 351 | 351 | if( p_spu->i_buffer != p_sys->i_spu_size ) |
|---|
| 352 | 352 | { |
|---|
| 353 | | msg_Warn( p_dec, "subtitle packets size=%d should be %d", |
|---|
| | 353 | msg_Warn( p_dec, "subtitle packets size=%zu should be %zu", |
|---|
| 354 | 354 | p_spu->i_buffer, p_sys->i_spu_size ); |
|---|
| 355 | 355 | } |
|---|
| 356 | 356 | |
|---|
| 357 | 357 | dbg_print( (DECODE_DBG_PACKET), |
|---|
| 358 | | "subtitle packet complete, size=%d", p_spu->i_buffer ); |
|---|
| | 358 | "subtitle packet complete, size=%zu", p_spu->i_buffer ); |
|---|
| 359 | 359 | |
|---|
| 360 | 360 | p_sys->i_state = SUBTITLE_BLOCK_EMPTY; |
|---|
| … | … | |
| 438 | 438 | { |
|---|
| 439 | 439 | msg_Dbg( p_dec, "x-start: %d, y-start: %d, width: %d, height %d, " |
|---|
| 440 | | "spu size: %d, duration: %lu (d:%d p:%d)", |
|---|
| | 440 | "spu size: %zu, duration: %"PRIu64" (d:%zu p:%"PRIu16")", |
|---|
| 441 | 441 | p_sys->i_x_start, p_sys->i_y_start, |
|---|
| 442 | 442 | p_sys->i_width, p_sys->i_height, |
|---|
| 443 | | p_sys->i_spu_size, (long unsigned int) p_sys->i_duration, |
|---|
| | 443 | p_sys->i_spu_size, p_sys->i_duration, |
|---|
| 444 | 444 | p_sys->i_image_length, p_sys->i_image_offset); |
|---|
| 445 | 445 | |
|---|
| ra965485 |
r3ccefd7 |
|
| 402 | 402 | tk->i_frame != i_len ) ) |
|---|
| 403 | 403 | { |
|---|
| 404 | | msg_Dbg( p_demux, "sending size=%d", tk->p_frame->i_buffer ); |
|---|
| | 404 | msg_Dbg( p_demux, "sending size=%zu", tk->p_frame->i_buffer ); |
|---|
| 405 | 405 | |
|---|
| 406 | 406 | es_out_Send( p_demux->out, tk->p_es, tk->p_frame ); |
|---|