Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-21 21:28:56 +0300
committerMichael Niedermayer <michaelni@gmx.at>2015-03-21 21:28:56 +0300
commit44309dd29466bf2d9d9fa26ab6e73e7e64989c75 (patch)
tree8c434a1a2832eacc81f9c029ba3c075ab69bdb36 /libavcodec
parentdd186b5825c41f0854c749d81b623578509e9f4a (diff)
avcodec/mpegvideo: support mbskip_table==NULL in ff_print_debug_info2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mpegvideo.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 1f2fc1b556..b7e4fe1dca 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -2249,7 +2249,7 @@ void ff_print_debug_info2(AVCodecContext *avctx, AVFrame *pict, uint8_t *mbskip_
for (y = 0; y < mb_height; y++) {
for (x = 0; x < mb_width; x++) {
if (avctx->debug & FF_DEBUG_SKIP) {
- int count = mbskip_table[x + y * mb_stride];
+ int count = mbskip_table ? mbskip_table[x + y * mb_stride] : 0;
if (count > 9)
count = 9;
av_log(avctx, AV_LOG_DEBUG, "%1d", count);
@@ -2518,7 +2518,8 @@ void ff_print_debug_info2(AVCodecContext *avctx, AVFrame *pict, uint8_t *mbskip_
// hmm
}
}
- mbskip_table[mb_index] = 0;
+ if (mbskip_table)
+ mbskip_table[mb_index] = 0;
}
}
}