eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 10:00:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
d16079abf473b51be7686d20f8014bb48a095722
ffmpeg/libavcodec/vaapi.c
Michael Niedermayer 228fded036 Merge commit 'bab8d73765238bfeea7a8dfd454f40ac213b3d22' 
* commit 'bab8d73765238bfeea7a8dfd454f40ac213b3d22':
  vaapi: wrap codec specific functions in appropiate #ifs

Conflicts:
	libavcodec/vaapi.c

See: f2118d44c9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-15 13:03:01 +01:00

7.1 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink