Merge commit '28f2d3c5a5a3a3c14a68cf691054f15e4f23355a' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 17:15:49 +0000 (19:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 17:15:49 +0000 (19:15 +0200)
commitcdfd61b78ba6026b51526661daad6cd708fab352
treeb5cdd019de0de23df9c90b860586108a002e07fd
parentf3ae90621e03e2d91201e4f863c6d5b61555cadd
parent28f2d3c5a5a3a3c14a68cf691054f15e4f23355a
Merge commit '28f2d3c5a5a3a3c14a68cf691054f15e4f23355a' into release/0.10

* commit '28f2d3c5a5a3a3c14a68cf691054f15e4f23355a':
  cmdutils: Conditionally compile libswscale-related bits

Conflicts:
cmdutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
cmdutils.c