diff options
| author | James Almer <jamrial@gmail.com> | 2018-04-04 00:43:01 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-04-04 00:43:01 -0300 |
| commit | fefe47b70101ea1cb4f7752ede168d883507a5aa (patch) | |
| tree | 20a67071e2bdbaccbc25f7fe32bab110cfbec47c /libavcodec/clearvideo.c | |
| parent | d95f15b14d5cf56af4b157423e93609003858c5e (diff) | |
| download | ffmpeg-streaming-fefe47b70101ea1cb4f7752ede168d883507a5aa.zip ffmpeg-streaming-fefe47b70101ea1cb4f7752ede168d883507a5aa.tar.gz | |
avcodec/clearvideo: fix mixed code and declarations
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/clearvideo.c')
| -rw-r--r-- | libavcodec/clearvideo.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/clearvideo.c b/libavcodec/clearvideo.c index 269370e..9319cac 100644 --- a/libavcodec/clearvideo.c +++ b/libavcodec/clearvideo.c @@ -296,6 +296,7 @@ static int copyadd_block(AVCodecContext *avctx, AVFrame *dst, AVFrame *src, static MV mvi_predict(MVInfo *mvi, int mb_x, int mb_y, MV diff) { MV res, pred_mv; + int left_mv, right_mv, top_mv, bot_mv; if (mvi->top) { if (mb_x > 0) { @@ -315,16 +316,16 @@ static MV mvi_predict(MVInfo *mvi, int mb_x, int mb_y, MV diff) res = pred_mv; - int left_mv = -((mb_x * mvi->mb_size)); - int right_mv = ((mvi->mb_w - mb_x - 1) * mvi->mb_size); + left_mv = -((mb_x * mvi->mb_size)); + right_mv = ((mvi->mb_w - mb_x - 1) * mvi->mb_size); if (res.x < left_mv) { res.x = left_mv; } if (res.x > right_mv) { res.x = right_mv; } - int top_mv = -((mb_y * mvi->mb_size)); - int bot_mv = ((mvi->mb_h - mb_y - 1) * mvi->mb_size); + top_mv = -((mb_y * mvi->mb_size)); + bot_mv = ((mvi->mb_h - mb_y - 1) * mvi->mb_size); if (res.y < top_mv) { res.y = top_mv; } |
