Merge commit 'cf7d2f2d2134c0854edf2db91e7436ac2bc9874f'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 13:27:59 +0000 (15:27 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 13:27:59 +0000 (15:27 +0200)
commit773570a9dce94922471530d29585e5e87ff64f7a
tree70f82cc0f1652a8063e6deae287cca1ed0ecc3e5
parent24fea89983756fcd9bfee475581a7b049b3ad8ee
parentcf7d2f2d2134c0854edf2db91e7436ac2bc9874f
Merge commit 'cf7d2f2d2134c0854edf2db91e7436ac2bc9874f'

* commit 'cf7d2f2d2134c0854edf2db91e7436ac2bc9874f':
  lavc: Simplify checking quant bias option

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/dnxhdenc.c
libavcodec/mpegvideo_enc.c