Merge commit '47b447aaff1bc30ba986ca757346a2c5c95b786a'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 24 Aug 2015 08:34:38 +0000 (10:34 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 24 Aug 2015 08:34:38 +0000 (10:34 +0200)
commit59cae1916e30872448e6cafc85c5632ee42ebd1a
treef5ab89ad4ad7cb7c2c9f006893f6e02e8938b434
parent0cbae3763d96f40e0eae0c9f04794a38e1f78ca6
parent47b447aaff1bc30ba986ca757346a2c5c95b786a
Merge commit '47b447aaff1bc30ba986ca757346a2c5c95b786a'

* commit '47b447aaff1bc30ba986ca757346a2c5c95b786a':
  imgutils: Fix a typo in avcodec_get_pix_fmt_loss

Not merged, this code was refactored and moved to avutil.

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