diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-01-03 13:18:49 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-01-04 01:28:28 +0100 |
| commit | 54e68fb3b89247084dfaeb3697a18f8ba92c5ea5 (patch) | |
| tree | 8dabeb2ca3e50cfff56ad189e33f1c4658264f60 /libavcodec | |
| parent | 9dec55748cd5cf371d8f3eb35bac073d285f0617 (diff) | |
| download | ffmpeg-54e68fb3b89247084dfaeb3697a18f8ba92c5ea5.tar.gz | |
Merge some declarations and initializations.
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.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dnxhdenc.c | 6 | ||||
| -rw-r--r-- | libavcodec/h264.c | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index d1ab597d1d..2b7089b946 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -580,9 +580,9 @@ static int dnxhd_encode_thread(AVCodecContext *avctx, void *arg, int jobnr, int for (i = 0; i < 8; i++) { DCTELEM *block = ctx->blocks[i]; - int last_index, overflow; - int n = dnxhd_switch_matrix(ctx, i); - last_index = ctx->m.dct_quantize(&ctx->m, block, i, qscale, &overflow); + int overflow, n = dnxhd_switch_matrix(ctx, i); + int last_index = ctx->m.dct_quantize(&ctx->m, block, i, + qscale, &overflow); //START_TIMER; dnxhd_encode_block(ctx, block, last_index, n); //STOP_TIMER("encode_block"); diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 316a57d75e..bb7619dee2 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -4126,9 +4126,7 @@ int main(void){ init_get_bits(&gb, temp, 8*SIZE); for(i=0; i<COUNT; i++){ - int j, s; - - s= show_bits(&gb, 24); + int j, s = show_bits(&gb, 24); START_TIMER j= get_ue_golomb(&gb); @@ -4151,9 +4149,7 @@ int main(void){ init_get_bits(&gb, temp, 8*SIZE); for(i=0; i<COUNT; i++){ - int j, s; - - s= show_bits(&gb, 24); + int j, s = show_bits(&gb, 24); START_TIMER j= get_se_golomb(&gb); |