You've already forked FFmpeg
							
							
				mirror of
				https://github.com/FFmpeg/FFmpeg.git
				synced 2025-10-30 23:18:11 +02:00 
			
		
		
		
	Place some START_TIMER invocations in separate blocks.
This fixes compilation failures related to START_TIMER/STOP_TIMER macros and -Werror=declaration-after-statement. START_TIMER declares variables and thus may not be placed after statements outside of a new block.
This commit is contained in:
		| @@ -757,7 +757,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, | ||||
|  | ||||
|     switch_buffers(ctx); | ||||
|  | ||||
|     //START_TIMER; | ||||
|     //{ START_TIMER; | ||||
|  | ||||
|     if (ctx->frame_type != FRAMETYPE_NULL) { | ||||
|         for (p = 0; p < 3; p++) { | ||||
| @@ -772,7 +772,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     //STOP_TIMER("decode_planes"); | ||||
|     //STOP_TIMER("decode_planes"); } | ||||
|  | ||||
|     if (ctx->frame.data[0]) | ||||
|         avctx->release_buffer(avctx, &ctx->frame); | ||||
|   | ||||
| @@ -2472,7 +2472,7 @@ static av_always_inline void RENAME(do_a_deblock)(uint8_t *src, int step, int st | ||||
|     int64_t dc_mask, eq_mask, both_masks; | ||||
|     int64_t sums[10*8*2]; | ||||
|     src+= step*3; // src points to begin of the 8x8 Block | ||||
| //START_TIMER | ||||
|     //{ START_TIMER | ||||
|     __asm__ volatile( | ||||
|         "movq %0, %%mm7                         \n\t" | ||||
|         "movq %1, %%mm6                         \n\t" | ||||
| @@ -2998,7 +2998,8 @@ static av_always_inline void RENAME(do_a_deblock)(uint8_t *src, int step, int st | ||||
|     STOP_TIMER("step16") | ||||
| }else{ | ||||
|     STOP_TIMER("stepX") | ||||
| }*/ | ||||
| } | ||||
|     } */ | ||||
| } | ||||
| #endif //HAVE_MMX | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user