diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-22 17:26:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-22 17:26:37 +0200 |
| commit | 05cf687d130a976d96051f6f6bdb63cf724d3709 (patch) | |
| tree | 876efe0baa8b03a560dcd611f6d0c72a0840cf85 /libavutil/opt.h | |
| parent | eaf15bba03b4067cb56b704ebc2e0b36a501ef22 (diff) | |
| parent | 57214b2f7f9b1ccfd61e232e8989b5ee850f169c (diff) | |
| download | ffmpeg-05cf687d130a976d96051f6f6bdb63cf724d3709.tar.gz | |
Merge commit '57214b2f7f9b1ccfd61e232e8989b5ee850f169c'
* commit '57214b2f7f9b1ccfd61e232e8989b5ee850f169c':
dds: Fix palette decoding
Conflicts:
libavcodec/dds.c
See: 36a87c2dc7f302da3778bd0cff050b5c93a730c7
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavutil/opt.h')
0 files changed, 0 insertions, 0 deletions