Module: libav Branch: master Commit: 54e68fb3b89247084dfaeb3697a18f8ba92c5ea5
Author: Diego Biurrun <[email protected]> Committer: Diego Biurrun <[email protected]> Date: Tue Jan 3 13:18:49 2012 +0100 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. --- libavcodec/dnxhdenc.c | 6 +++--- libavcodec/h264.c | 8 ++------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index d1ab597..2b7089b 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 316a57d..bb7619d 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); _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
