Merge commit '99c554efc8b09c3f1bb2fb41c3da5431085f7470'
authorClément Bœsch <clement@stupeflix.com>
Mon, 20 Jun 2016 09:37:49 +0000 (11:37 +0200)
committerClément Bœsch <clement@stupeflix.com>
Mon, 20 Jun 2016 09:47:40 +0000 (11:47 +0200)
commitd98ca4b14c673db8eb3cc124e42ff7a660da9109
treea7055ec793ab9300d2c78847fa38b899fa2b6a0d
parent38a2d9aeec083000d3bf14f94a2b4effd8ae2769
parent99c554efc8b09c3f1bb2fb41c3da5431085f7470
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>
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_slice.c
libavcodec/mpegvideo.c