]> git.sesse.net Git - ffmpeg/commitdiff
Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 7 May 2013 12:21:45 +0000 (14:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 7 May 2013 12:21:49 +0000 (14:21 +0200)
* cehoyos/master:
  Support decoding of Lagarith frame type FRAME_SOLID_COLOR.

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

Trivial merge