[FFmpeg-devel] [PATCH]Silence a warning when compiling Escape 130
Carl Eugen Hoyos
cehoyos at ag.or.at
Thu Dec 8 14:25:32 CET 2011
Hi!
Attached fixes "libavcodec/escape130.c:177:17: warning: ISO C90 forbids mixed
declarations and code"
Please comment, Carl Eugen
-------------- next part --------------
diff --git a/libavcodec/escape130.c b/libavcodec/escape130.c
index 322ec8f..1198010 100644
--- a/libavcodec/escape130.c
+++ b/libavcodec/escape130.c
@@ -171,9 +171,6 @@ static int escape130_decode_frame(AVCodecContext *avctx,
}
} else {
if (get_bits1(&gb)) {
- unsigned sign_selector = get_bits(&gb, 6);
- unsigned difference_selector = get_bits(&gb, 2);
- y_base = 2 * get_bits(&gb, 5);
static const uint8_t offset_table[] = {2, 4, 10, 20};
static const int8_t sign_table[64][4] =
{ {0, 0, 0, 0},
@@ -233,6 +230,9 @@ static int escape130_decode_frame(AVCodecContext *avctx,
{1, 1, -1, -1},
{-1, 1, -1, -1},
{1, -1, -1, -1} };
+ unsigned sign_selector = get_bits(&gb, 6);
+ unsigned difference_selector = get_bits(&gb, 2);
+ y_base = 2 * get_bits(&gb, 5);
for (i = 0; i < 4; i++) {
y[i] = av_clip((int)y_base + offset_table[difference_selector] *
sign_table[sign_selector][i], 0, 63);
More information about the ffmpeg-devel
mailing list