finished printf -> x264_log conversion.

git-svn-id: svn://svn.videolan.org/x264/trunk@99 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/encoder/analyse.c b/encoder/analyse.c
index 8294adea14f619ca70f85f7d8f5ef4f62aea50bd..defedce06db2f93f93afc156b1b686231f4304c9 100644 (file)
--- a/encoder/analyse.c
+++ b/encoder/analyse.c
@@ -1366,7 +1366,7 @@ void x264_macroblock_analyse( x264_t *h )
                                       analysis.l0.me4x4[i8x8][3].cost;
                             break;
                         default:
-                            fprintf( stderr, "internal error (!8x8 && !4x4)" );
+                            x264_log( h, X264_LOG_ERROR, "internal error (!8x8 && !4x4)\n" );
                             break;
                     }
                 }
@@ -1551,7 +1551,7 @@ void x264_macroblock_analyse( x264_t *h )
                     break;
 
                 default:
-                    fprintf( stderr, "internal error P_L0 and partition=%d\n", h->mb.i_partition );
+                    x264_log( h, X264_LOG_ERROR, "internal error P_L0 and partition=%d\n", h->mb.i_partition );
                     break;
             }
             break;
@@ -1583,7 +1583,7 @@ void x264_macroblock_analyse( x264_t *h )
                         x264_macroblock_cache_mv( h, x+1, y+1, 1, 1, 0, analysis.l0.me4x4[i][3].mv[0], analysis.l0.me4x4[i][3].mv[1] );
                         break;
                     default:
-                        fprintf( stderr, "internal error\n" );
+                        x264_log( h, X264_LOG_ERROR, "internal error\n" );
                         break;
                 }
             }
@@ -1656,7 +1656,7 @@ void x264_macroblock_analyse( x264_t *h )
                 x264_mb_cache_mv_b8x16( h, &analysis, 1, 1 );
                 break;
             default:
-                fprintf( stderr, "internal error (invalid MB type)\n" );
+                x264_log( h, X264_LOG_ERROR, "internal error (invalid MB type)\n" );
                 break;
             }
     }

diff --git a/encoder/cabac.c b/encoder/cabac.c
index 762ea3414479707a6cd348c7f6be5bdceddae086..2557d25bfd2533f5d136a87a2825d3bdf7e68964 100644 (file)
--- a/encoder/cabac.c
+++ b/encoder/cabac.c
@@ -279,7 +279,7 @@ static void x264_cabac_mb_type( x264_t *h )
                         idx++;
                     break;
                 default:
-                    fprintf( stderr, "error in B mb type\n" );
+                    x264_log(h, X264_LOG_ERROR, "error in B mb type\n" );
                     return;
             }
 
@@ -294,7 +294,7 @@ static void x264_cabac_mb_type( x264_t *h )
     }
     else
     {
-        fprintf( stderr, "unknown SLICE_TYPE unsupported in x264_macroblock_write_cabac\n" );
+        x264_log(h, X264_LOG_ERROR, "unknown SLICE_TYPE unsupported in x264_macroblock_write_cabac\n" );
     }
 }
 

diff --git a/encoder/cavlc.c b/encoder/cavlc.c
index f1df9a2938ff4c89e6129678daf85711c263679d..a9715c2767dec696f6b3f156e0476212667d436c 100644 (file)
--- a/encoder/cavlc.c
+++ b/encoder/cavlc.c
@@ -226,7 +226,7 @@ static void block_residual_write_cavlc( x264_t *h, bs_t *s, int i_idx, int *l, i
 
             if( i_level_code >= ( 1 << 12 ) || i_level_code < 0 )
             {
-                fprintf( stderr, "OVERFLOW levelcode=%d\n", i_level_code );
+                x264_log(h, X264_LOG_ERROR, "OVERFLOW levelcode=%d\n", i_level_code );
             }
 
             bs_write( s, 12, i_level_code );    /* check overflow ?? */
@@ -360,7 +360,7 @@ void x264_macroblock_write_cavlc( x264_t *h, bs_t *s )
             i_mb_i_offset = 23;
             break;
         default:
-            fprintf( stderr, "internal error or slice unsupported\n" );
+            x264_log(h, X264_LOG_ERROR, "internal error or slice unsupported\n" );
             return;
     }
 
@@ -632,7 +632,7 @@ void x264_macroblock_write_cavlc( x264_t *h, bs_t *s )
     }
     else
     {
-        fprintf( stderr, "invalid/unhandled mb_type\n" );
+        x264_log(h, X264_LOG_ERROR, "invalid/unhandled mb_type\n" );
         return;
     }