Commit 3846b5c1 authored by michael's avatar michael

Move declarations in mpeg1_encode_motion() closer to where they are needed.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18546 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent a8392540
...@@ -666,18 +666,17 @@ void mpeg1_encode_mb(MpegEncContext *s, DCTELEM block[6][64], int motion_x, int ...@@ -666,18 +666,17 @@ void mpeg1_encode_mb(MpegEncContext *s, DCTELEM block[6][64], int motion_x, int
// RAL: Parameter added: f_or_b_code // RAL: Parameter added: f_or_b_code
static void mpeg1_encode_motion(MpegEncContext *s, int val, int f_or_b_code) static void mpeg1_encode_motion(MpegEncContext *s, int val, int f_or_b_code)
{ {
int code, bit_size, l, bits, range, sign;
if (val == 0) { if (val == 0) {
/* zero vector */ /* zero vector */
put_bits(&s->pb, put_bits(&s->pb,
ff_mpeg12_mbMotionVectorTable[0][1], ff_mpeg12_mbMotionVectorTable[0][1],
ff_mpeg12_mbMotionVectorTable[0][0]); ff_mpeg12_mbMotionVectorTable[0][0]);
} else { } else {
bit_size = f_or_b_code - 1; int code, sign, bits;
range = 1 << bit_size; int bit_size = f_or_b_code - 1;
int range = 1 << bit_size;
/* modulo encoding */ /* modulo encoding */
l= INT_BIT - 5 - bit_size; int l= INT_BIT - 5 - bit_size;
val= (val<<l)>>l; val= (val<<l)>>l;
if (val >= 0) { if (val >= 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment