]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ac649bb 0fbb271)
Merge commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Feb 2015 20:12:29 +0000 (21:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Feb 2015 20:12:33 +0000 (21:12 +0100)
* commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23':
  qsv_api: fix building with libmfx disabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/qsv_api.c patch | diff1 | diff2 | blob | history

diff --cc libavcodec/qsv_api.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.