Loading lib_com/disclaimer.c +6 −0 Original line number Diff line number Diff line Loading @@ -44,6 +44,7 @@ Word16 print_disclaimer( FILE *fPtr ) { fprintf( fPtr, "\n==================================================================================================\n" ); <<<<<<< HEAD <<<<<<< HEAD fprintf( fPtr, "\n" ); fprintf( fPtr, " 3GPP TS26.251 IVAS Codec Version IVAS-FX-3.0 (fixed-point C-Code)\n" ); Loading @@ -52,6 +53,11 @@ Word16 print_disclaimer( FILE *fPtr ) fprintf( fPtr, " 3GPP TS26.251 IVAS Codec Version IVAS-FX-3.0 (fixed-point C-Code)\n" ); fprintf( fPtr, " \n" ); >>>>>>> 8dafeeec2 (update version number printout) ======= fprintf( fPtr, "\n" ); fprintf( fPtr, " 3GPP TS26.251 IVAS Codec Version IVAS-FX-3.0 (fixed-point C-Code)\n" ); fprintf( fPtr, "\n" ); >>>>>>> cda7a50ab (harmonize whitespace with FL) fprintf( fPtr, " Based on EVS Codec (Alternative Fixed Point) 3GPP TS26.452 Nov 04, 2021,\n" ); fprintf( fPtr, " Version 16.4.0\n" ); fprintf( fPtr, "\n" ); Loading Loading
lib_com/disclaimer.c +6 −0 Original line number Diff line number Diff line Loading @@ -44,6 +44,7 @@ Word16 print_disclaimer( FILE *fPtr ) { fprintf( fPtr, "\n==================================================================================================\n" ); <<<<<<< HEAD <<<<<<< HEAD fprintf( fPtr, "\n" ); fprintf( fPtr, " 3GPP TS26.251 IVAS Codec Version IVAS-FX-3.0 (fixed-point C-Code)\n" ); Loading @@ -52,6 +53,11 @@ Word16 print_disclaimer( FILE *fPtr ) fprintf( fPtr, " 3GPP TS26.251 IVAS Codec Version IVAS-FX-3.0 (fixed-point C-Code)\n" ); fprintf( fPtr, " \n" ); >>>>>>> 8dafeeec2 (update version number printout) ======= fprintf( fPtr, "\n" ); fprintf( fPtr, " 3GPP TS26.251 IVAS Codec Version IVAS-FX-3.0 (fixed-point C-Code)\n" ); fprintf( fPtr, "\n" ); >>>>>>> cda7a50ab (harmonize whitespace with FL) fprintf( fPtr, " Based on EVS Codec (Alternative Fixed Point) 3GPP TS26.452 Nov 04, 2021,\n" ); fprintf( fPtr, " Version 16.4.0\n" ); fprintf( fPtr, "\n" ); Loading