git.sesse.net Git - ffmpeg/commit

]> git.sesse.net Git - ffmpeg/commit

author	Michael Niedermayer <michaelni@gmx.at>
	Wed, 15 Oct 2014 10:30:07 +0000 (12:30 +0200)
committer	Michael Niedermayer <michaelni@gmx.at>
	Wed, 15 Oct 2014 10:30:07 +0000 (12:30 +0200)
commit	51c810e62b63a1451b337b1cba0141b386066668
tree	1b5d4697495201e68400608a0bb9fc1ba738ebb8	tree \| snapshot
parent	fd937866f7b7ae3303e8a78b1e9a48d853360d62	commit \| diff
parent	d565fef1b83b6c5f8afb32229260b79f67c68109	commit \| diff

Merge commit 'd565fef1b83b6c5f8afb32229260b79f67c68109'

* commit 'd565fef1b83b6c5f8afb32229260b79f67c68109':
vdpau: add AV_HWACCEL_FLAG_IGNORE_LEVEL to skip the codec level check

Conflicts:
libavcodec/version.h

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

Unnamed repository; edit this file 'description' to name the repository.