Merge commit '1ba1fede9dfe03dc48862e5e0530cca7192f5038'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 17:12:00 +0000 (17:12 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 17:12:00 +0000 (17:12 +0000)
commitdc22269b2325560636f4e8b956bf5e00943562d9
tree1d58d7fe422db5697b96a1ef026abee80a119573
parent113c25653320b0a72548d07242a3cc4ce086f02d
parent1ba1fede9dfe03dc48862e5e0530cca7192f5038
Merge commit '1ba1fede9dfe03dc48862e5e0530cca7192f5038'

This commit is a no-op.

* commit '1ba1fede9dfe03dc48862e5e0530cca7192f5038':
  flacenc: Restore defaults and range for {min, max}_prediction_order

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>