[FFmpeg-cvslog] Merge commit '1ba1fede9dfe03dc48862e5e0530cca7192f5038'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Tue Feb 16 17:12:00 2016 +0000| [dc22269b2325560636f4e8b956bf5e00943562d9] | committer: Derek Buitenhuis

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dc22269b2325560636f4e8b956bf5e00943562d9
---