]> git.sesse.net Git - ffmpeg/commitdiff
Merge remote-tracking branch 'rdp/combined'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Feb 2013 20:00:46 +0000 (21:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Feb 2013 20:00:53 +0000 (21:00 +0100)
* rdp/combined:
  hdyc col
  dshow: use standardized raw pixel format lookup

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

Trivial merge