diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-20 11:37:49 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-20 11:47:40 +0200 |
| commit | d98ca4b14c673db8eb3cc124e42ff7a660da9109 (patch) | |
| tree | a7055ec793ab9300d2c78847fa38b899fa2b6a0d /libavcodec/mpegvideo.c | |
| parent | 38a2d9aeec083000d3bf14f94a2b4effd8ae2769 (diff) | |
| parent | 99c554efc8b09c3f1bb2fb41c3da5431085f7470 (diff) | |
| download | ffmpeg-d98ca4b14c673db8eb3cc124e42ff7a660da9109.tar.gz | |
Merge commit '99c554efc8b09c3f1bb2fb41c3da5431085f7470'
* commit '99c554efc8b09c3f1bb2fb41c3da5431085f7470':
h264: eliminate low_delay
ff_print_debug_info2() is adjusted to allow a NULL pointer as low_delay.
It's only useful for MPEG codecs with the exception of H264.
Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 80d5386ad0..ecb585f95a 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1757,7 +1757,8 @@ void ff_print_debug_info2(AVCodecContext *avctx, AVFrame *pict, uint8_t *mbskip_ const int mv_stride = (mb_width << mv_sample_log2) + (avctx->codec->id == AV_CODEC_ID_H264 ? 0 : 1); - *low_delay = 0; // needed to see the vectors without trashing the buffers + if (low_delay) + *low_delay = 0; // needed to see the vectors without trashing the buffers avcodec_get_chroma_sub_sample(avctx->pix_fmt, &h_chroma_shift, &v_chroma_shift); |