Merge commit '243df1351d2d928caa084a5704ed783f0b83f072'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 31 Jan 2016 13:24:50 +0000 (13:24 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 31 Jan 2016 13:29:04 +0000 (13:29 +0000)
commitc86ecdf3f7b0c78ebfea23989b1a5d34885e119f
treec6606f19af814132b8cffa12fc3f5d9d2dc2cb9e
parent899e19f1776c607c126b291a7e0a614782f18f42
parent243df1351d2d928caa084a5704ed783f0b83f072
Merge commit '243df1351d2d928caa084a5704ed783f0b83f072'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/alacenc.c
libavcodec/avcodec.h
libavcodec/flacenc.c
libavcodec/options_table.h