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)
commit1d8b1f0e51106c1a24cee565cd29ea469a1d83f8
tree6a401fdbb8640e37ac4e3841c03fbfa5812f051b
parent6ef7b6af6be0a1f8d4b355ccb692289857d1f967
parent03ece7b0404f0104b71adc9c69051689863c4e4a
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  proresdec: simplify slice component offsets handling

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