Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Oct 2013 14:48:10 +0000 (16:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Oct 2013 14:48:26 +0000 (16:48 +0200)
* qatar/master:
  prores: Reject negative run and level values

See: 93c220e895a417e88a6be7df85e250c5c3f675b6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/proresdec_lgpl.c

Simple merge