diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-05 21:00:46 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-05 21:00:53 +0100 |
commit | f7b7f021e52827ccc82e0f1338b5738d4b653ae2 (patch) | |
tree | a7fbe344fb71b689f603cf53fa9a9c22bdb9817a /libswscale/swscale.h | |
parent | c2dd5a18b27bb33d871d41fbed9104f3a68d68fe (diff) | |
parent | c540312ac3b58e0bbd751844fc2c47c6e3713cf5 (diff) | |
download | ffmpeg-f7b7f021e52827ccc82e0f1338b5738d4b653ae2.tar.gz |
Merge remote-tracking branch 'rdp/combined'
* rdp/combined:
hdyc col
dshow: use standardized raw pixel format lookup
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale.h')
0 files changed, 0 insertions, 0 deletions