[FFmpeg-cvslog] Merge commit '243df1351d2d928caa084a5704ed783f0b83f072'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun Jan 31 13:24:50 2016 +0000| [c86ecdf3f7b0c78ebfea23989b1a5d34885e119f] | committer: Derek Buitenhuis

Merge commit '243df1351d2d928caa084a5704ed783f0b83f072'

* commit '243df1351d2d928caa084a5704ed783f0b83f072':
  lavc: Move {min,max}_prediction_order to codec private options

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

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