generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge some declarations and initializations.

Browse Source 
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:
Diego Biurrun 2012-01-03 13:18:49 +01:00
parent 9dec55748c
commit 54e68fb3b8
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/dnxhdenc.c
View File

@ -580,9 +580,9 @@ static int dnxhd_encode_thread(AVCodecContext *avctx, void *arg, int jobnr, int
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
DCTELEM *block = ctx->blocks[i]; DCTELEM *block = ctx->blocks[i];
int last_index, overflow; int overflow, n = dnxhd_switch_matrix(ctx, i);
int n = dnxhd_switch_matrix(ctx, i); int last_index = ctx->m.dct_quantize(&ctx->m, block, i,
last_index = ctx->m.dct_quantize(&ctx->m, block, i, qscale, &overflow); qscale, &overflow);
//START_TIMER; //START_TIMER;
dnxhd_encode_block(ctx, block, last_index, n); dnxhd_encode_block(ctx, block, last_index, n);
//STOP_TIMER("encode_block"); //STOP_TIMER("encode_block");

8
libavcodec/h264.c
View File

@ -4126,9 +4126,7 @@ int main(void){
init_get_bits(&gb, temp, 8*SIZE); init_get_bits(&gb, temp, 8*SIZE);
for(i=0; i<COUNT; i++){ for(i=0; i<COUNT; i++){
int j, s; int j, s = show_bits(&gb, 24);
s= show_bits(&gb, 24);
START_TIMER START_TIMER
j= get_ue_golomb(&gb); j= get_ue_golomb(&gb);
@ -4151,9 +4149,7 @@ int main(void){
init_get_bits(&gb, temp, 8*SIZE); init_get_bits(&gb, temp, 8*SIZE);
for(i=0; i<COUNT; i++){ for(i=0; i<COUNT; i++){
int j, s; int j, s = show_bits(&gb, 24);
s= show_bits(&gb, 24);
START_TIMER START_TIMER
j= get_se_golomb(&gb); j= get_se_golomb(&gb);