diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 00:50:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 00:50:37 +0200 |
| commit | d3284a62082b8224d2a31e050f160ccda9ce2487 (patch) | |
| tree | 360df477a1ba2d25e257e6661bc0c777aacc8e13 /libswscale/swscale_unscaled.c | |
| parent | 275155081f2e250b707aa89fec21d09dff6bb8d6 (diff) | |
| parent | defb87eef4ddcfcabfbc3884ff8490dcb4e206c5 (diff) | |
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavd/qtkit: add device category
lavd/fbdev_enc: implement get_device_list
lavd: no default device unless explicitly set
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale_unscaled.c')
0 files changed, 0 insertions, 0 deletions