Commit 352e8b2b authored by Sam Hocevar's avatar Sam Hocevar

* Fix a few warnings caused by format string/type mismatches.

parent 487341a9
...@@ -610,7 +610,7 @@ int main(int i_argc, char* pa_argv[]) ...@@ -610,7 +610,7 @@ int main(int i_argc, char* pa_argv[])
(long long int)p_stream->pid[i_pid].i_pcr, (long long int)i_prev_pcr, (long long int)p_stream->pid[i_pid].i_pcr, (long long int)i_prev_pcr,
(long long int)i_delta, i_bytes ); (long long int)i_delta, i_bytes );
if( (i_delta > 0) ) if( (i_delta > 0) )
printf( "%lld Kbps", ((i_bytes*8)/i_delta) ); printf( "%lld Kbps", (long long int)(i_bytes*8)/i_delta );
else else
printf( "-" ); printf( "-" );
if( (i_delta <= 0) || b_verbose ) if( (i_delta <= 0) || b_verbose )
...@@ -620,7 +620,7 @@ int main(int i_argc, char* pa_argv[]) ...@@ -620,7 +620,7 @@ int main(int i_argc, char* pa_argv[])
} }
} }
/* Handle discontinuities if they occured, /* Handle discontinuities if they occurred,
* according to ISO/IEC 13818-1: DIS pages 20-22 */ * according to ISO/IEC 13818-1: DIS pages 20-22 */
if( b_adaptation ) if( b_adaptation )
{ {
...@@ -638,13 +638,13 @@ int main(int i_argc, char* pa_argv[]) ...@@ -638,13 +638,13 @@ int main(int i_argc, char* pa_argv[])
i_delta = (long long int)p_stream->pid[i_pid].i_pcr - (long long int)i_prev_pcr; i_delta = (long long int)p_stream->pid[i_pid].i_pcr - (long long int)i_prev_pcr;
printf( "New PCR pid %d, value %lld, previous %lld, delta %lld, bytes %u, ", printf( "New PCR pid %d, value %lld, previous %lld, delta %lld, bytes %u, ",
i_pid, i_pid,
(long long int)p_stream->pid[i_pid].i_pcr, (long long int)p_stream->pid[i_pid].i_pcr,
(long long int)i_prev_pcr, (long long int)i_prev_pcr,
i_delta, (long long int)i_delta,
i_bytes ); i_bytes );
if( i_delta > 0 ) if( i_delta > 0 )
printf( "%lld", (i_bytes*8)/(i_delta/1000) ); printf( "%lld", (long long int)(i_bytes*8)/(i_delta/1000) );
printf( "\n" ); printf( "\n" );
#ifdef HAVE_GETTIMEOFDAY #ifdef HAVE_GETTIMEOFDAY
......
...@@ -78,7 +78,8 @@ ...@@ -78,7 +78,8 @@
if(!i_err && (s_decoded.name != p_new_decoded->name)) \ if(!i_err && (s_decoded.name != p_new_decoded->name)) \
{ \ { \
fprintf(stderr, "\nError: integer %s %llu -> %llu\n", #name, \ fprintf(stderr, "\nError: integer %s %llu -> %llu\n", #name, \
(uint64_t)s_decoded.name, (uint64_t)p_new_decoded->name); \ (long long unsigned int)s_decoded.name, \
(long long unsigned int)p_new_decoded->name); \
i_err = 1; \ i_err = 1; \
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment