Commit 20ec0d2a authored by Michael Niedermayer's avatar Michael Niedermayer

mpegvideo: fix motion_val checks

Fixes CID604124
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent f4d73f0f
...@@ -1780,7 +1780,7 @@ void ff_print_debug_info(MpegEncContext *s, AVFrame *pict) ...@@ -1780,7 +1780,7 @@ void ff_print_debug_info(MpegEncContext *s, AVFrame *pict)
int mb_x; int mb_x;
for (mb_x = 0; mb_x < s->mb_width; mb_x++) { for (mb_x = 0; mb_x < s->mb_width; mb_x++) {
const int mb_index = mb_x + mb_y * s->mb_stride; const int mb_index = mb_x + mb_y * s->mb_stride;
if ((s->avctx->debug_mv) && pict->motion_val) { if ((s->avctx->debug_mv) && pict->motion_val[0]) {
int type; int type;
for (type = 0; type < 3; type++) { for (type = 0; type < 3; type++) {
int direction = 0; int direction = 0;
...@@ -1859,7 +1859,7 @@ void ff_print_debug_info(MpegEncContext *s, AVFrame *pict) ...@@ -1859,7 +1859,7 @@ void ff_print_debug_info(MpegEncContext *s, AVFrame *pict)
} }
} }
} }
if ((s->avctx->debug & FF_DEBUG_VIS_QP) && pict->motion_val) { if ((s->avctx->debug & FF_DEBUG_VIS_QP)) {
uint64_t c = (pict->qscale_table[mb_index] * 128 / 31) * uint64_t c = (pict->qscale_table[mb_index] * 128 / 31) *
0x0101010101010101ULL; 0x0101010101010101ULL;
int y; int y;
...@@ -1873,7 +1873,7 @@ void ff_print_debug_info(MpegEncContext *s, AVFrame *pict) ...@@ -1873,7 +1873,7 @@ void ff_print_debug_info(MpegEncContext *s, AVFrame *pict)
} }
} }
if ((s->avctx->debug & FF_DEBUG_VIS_MB_TYPE) && if ((s->avctx->debug & FF_DEBUG_VIS_MB_TYPE) &&
pict->motion_val) { pict->motion_val[0]) {
int mb_type = pict->mb_type[mb_index]; int mb_type = pict->mb_type[mb_index];
uint64_t u,v; uint64_t u,v;
int y; int y;
......
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