diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-22 14:38:57 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-22 14:38:57 +0000 |
| commit | 3c110b009b8efd3650f1b8caf31c331ee775f0ee (patch) | |
| tree | a26ed9d01cad9abf57f7d21464604c0a3159d87e /libswscale/swscale.h | |
| parent | 5b4be0c0394707b3e0502f9514c6ac9167c48015 (diff) | |
| parent | 9fd2bf09dbc630484d9e88a1d27f7e8508b70a2c (diff) | |
| download | ffmpeg-3c110b009b8efd3650f1b8caf31c331ee775f0ee.tar.gz | |
Merge commit '9fd2bf09dbc630484d9e88a1d27f7e8508b70a2c'
These are all no-ops.
* commit '9fd2bf09dbc630484d9e88a1d27f7e8508b70a2c':
hqx: correct type and size check of info_offset
dds: disable palette flag for compressed images
segafilm: Fix current_sample after seeking and avio_seek return type
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libswscale/swscale.h')
0 files changed, 0 insertions, 0 deletions