From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 11 Oct 2013 14:48:10 +0000 (+0200)
Subject: Merge remote-tracking branch 'qatar/master'
X-Git-Tag: n2.1~358
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/e7fa0417b31a671f5c7bb27f7f30f9acfcf4cfab

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  prores: Reject negative run and level values

See: 93c220e895a417e88a6be7df85e250c5c3f675b6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

e7fa0417b31a671f5c7bb27f7f30f9acfcf4cfab