diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-21 11:33:56 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-21 11:38:53 +0200 |
| commit | 28dcf1870660ea353ccc8e7a907712e681174228 (patch) | |
| tree | f94e5af64a2e68b25cabfb290b5ff97e73391a28 /libavcodec/dds.c | |
| parent | 93a0f4a3cbb823b2ddcb66a3a4c8f08aa7934078 (diff) | |
| parent | 39cdbb12aa2140520246bc4c3e22436b9f8a121a (diff) | |
| download | ffmpeg-28dcf1870660ea353ccc8e7a907712e681174228.tar.gz | |
Merge commit '39cdbb12aa2140520246bc4c3e22436b9f8a121a'
* commit '39cdbb12aa2140520246bc4c3e22436b9f8a121a':
dxva2_h264: Unbreak compilation after 3176217c6
This commit is a noop. The compilation was fixed in the merge commit
itself (1534ef87c74cc66a117bf61c467641c2129bc964). The additional local
unused sps is not merged.
Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'libavcodec/dds.c')
0 files changed, 0 insertions, 0 deletions