]> git.sesse.net Git - ffmpeg/commitdiff
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)
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>

Trivial merge