[FFmpeg-cvslog] Merge commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae'
Michael Niedermayer
git at videolan.org
Mon Sep 1 20:52:09 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep 1 20:42:50 2014 +0200| [38c4316fff74ce51752ddb3722df619ecd2e8de6] | committer: Michael Niedermayer
Merge commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae'
* commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae':
dxva2: Clean up definition of _WIN32_WINNT
Conflicts:
libavcodec/dxva2.h
See: 89946c8403752fbb26234d98f780188df8951a2e
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=38c4316fff74ce51752ddb3722df619ecd2e8de6
---
More information about the ffmpeg-cvslog
mailing list