git.osdn.net Git - android-x86/external-ffmpeg.git/commitdiff

author	Michael Niedermayer <michaelni@gmx.at>
	Mon, 1 Sep 2014 18:42:50 +0000 (20:42 +0200)
committer	Michael Niedermayer <michaelni@gmx.at>
	Mon, 1 Sep 2014 18:45:50 +0000 (20:45 +0200)

* commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae':
dxva2: Clean up definition of _WIN32_WINNT

Conflicts:
libavcodec/dxva2.h

See: 89946c8403752fbb26234d98f780188df8951a2e
Merged-by: Michael Niedermayer <michaelni@gmx.at>

		1	2
libavcodec/dxva2.h	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

external/ffmpeg

About OSDN

Find Software

Develop Software

Help