From: Hendrik Leppkes <h.leppkes@gmail.com>
Date: Tue, 29 Sep 2015 13:27:59 +0000 (+0200)
Subject: Merge commit 'cf7d2f2d2134c0854edf2db91e7436ac2bc9874f'
X-Git-Tag: n3.1-dev~2441
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/773570a9dce94922471530d29585e5e87ff64f7a?hp=773570a9dce94922471530d29585e5e87ff64f7a

Merge commit 'cf7d2f2d2134c0854edf2db91e7436ac2bc9874f'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
---