diff options
| author | Michael Niedermayer <[email protected]> | 2014-09-01 20:42:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-09-01 20:45:50 +0200 |
| commit | 38c4316fff74ce51752ddb3722df619ecd2e8de6 (patch) | |
| tree | 151d7aeb7ab48007aa2da913fdad2740b8ac3e4c /libavcodec/ffwavesynth.c | |
| parent | 052cd1ce720406918181c00418609fc6c8697e3a (diff) | |
| parent | b8962d64cc71af241601bcab5c3fcdc5735ef4ae (diff) | |
Merge commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae'
* commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae':
dxva2: Clean up definition of _WIN32_WINNT
Conflicts:
libavcodec/dxva2.h
See: 89946c8403752fbb26234d98f780188df8951a2e
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/ffwavesynth.c')
0 files changed, 0 insertions, 0 deletions