Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 May 2013 10:01:54 +0000 (12:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 May 2013 10:01:58 +0000 (12:01 +0200)
* qatar/master:
  proresdec: simplify slice component offsets handling

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

Simple merge