Merge commit '79d89cf2f4b62eeb653fd8139041c87e75f7ca65'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 17:10:42 +0000 (17:10 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 17:10:42 +0000 (17:10 +0000)
commit5ebaf1e1cbee6097264b594dc66177cc1b6daaf2
tree9e60cd2c32ebab2868ecabfeccc702676eff636b
parentbba2488f074904069e38865654413ec44d35ec24
parent79d89cf2f4b62eeb653fd8139041c87e75f7ca65
Merge commit '79d89cf2f4b62eeb653fd8139041c87e75f7ca65'

* commit '79d89cf2f4b62eeb653fd8139041c87e75f7ca65':
  flacenc: Clamp user-supplied min/max prediction orders

  Conflicts:
      libavcodec/flacenc.c

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