More "missing space after macro; invalid in C++11" error fixes.

This commit is contained in:
Augustin Cavalier
2017-12-12 20:08:26 -05:00
parent 36f28382db
commit 361f980f9d
2 changed files with 16 additions and 16 deletions
+6 -6
View File
@@ -77,32 +77,32 @@
#define SHOW_FLOW(seriousness, format, param...) \ #define SHOW_FLOW(seriousness, format, param...) \
do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \ do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \
dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT \ dprintf( "%s%s: " format "\n", FUNC_NAME, param ); DEBUG_WAIT \
}} while( 0 ) }} while( 0 )
#define SHOW_FLOW0(seriousness, format) \ #define SHOW_FLOW0(seriousness, format) \
do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \ do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \
dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT \ dprintf( "%s%s: " format "\n", FUNC_NAME); DEBUG_WAIT \
}} while( 0 ) }} while( 0 )
#define SHOW_INFO(seriousness, format, param...) \ #define SHOW_INFO(seriousness, format, param...) \
do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \ do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \
dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT \ dprintf( "%s%s: " format "\n", FUNC_NAME, param ); DEBUG_WAIT \
}} while( 0 ) }} while( 0 )
#define SHOW_INFO0(seriousness, format) \ #define SHOW_INFO0(seriousness, format) \
do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \ do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \
dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT \ dprintf( "%s%s: " format "\n", FUNC_NAME); DEBUG_WAIT \
}} while( 0 ) }} while( 0 )
#define SHOW_ERROR(seriousness, format, param...) \ #define SHOW_ERROR(seriousness, format, param...) \
do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \ do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \
dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT_ERROR \ dprintf( "%s%s: " format "\n", FUNC_NAME, param ); DEBUG_WAIT_ERROR \
}} while( 0 ) }} while( 0 )
#define SHOW_ERROR0(seriousness, format) \ #define SHOW_ERROR0(seriousness, format) \
do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \ do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \
dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT_ERROR \ dprintf( "%s%s: " format "\n", FUNC_NAME); DEBUG_WAIT_ERROR \
}} while( 0 ) }} while( 0 )
#endif #endif
@@ -291,8 +291,8 @@ colorspace_to_pixfmt(color_space format)
void void
dump_ffframe_audio(AVFrame* frame, const char* name) dump_ffframe_audio(AVFrame* frame, const char* name)
{ {
printf(BEGIN_TAG"AVFrame(%s) [ pkt_dts:%-10lld #samples:%-5d %s" printf(BEGIN_TAG "AVFrame(%s) [ pkt_dts:%-10lld #samples:%-5d %s"
" ]\n"END_TAG, " ]\n" END_TAG,
name, name,
frame->pkt_dts, frame->pkt_dts,
frame->nb_samples, frame->nb_samples,
@@ -305,8 +305,8 @@ dump_ffframe_video(AVFrame* frame, const char* name)
{ {
const char* picttypes[] = {"no pict type", "intra", "predicted", const char* picttypes[] = {"no pict type", "intra", "predicted",
"bidir pre", "s(gmc)-vop"}; "bidir pre", "s(gmc)-vop"};
printf(BEGIN_TAG"AVFrame(%s) [ pkt_dts:%-10lld cnum:%-5d dnum:%-5d %s%s" printf(BEGIN_TAG "AVFrame(%s) [ pkt_dts:%-10lld cnum:%-5d dnum:%-5d %s%s"
" ]\n"END_TAG, " ]\n" END_TAG,
name, name,
frame->pkt_dts, frame->pkt_dts,
frame->coded_picture_number, frame->coded_picture_number,