eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-20 22:10:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
05cc8c8e4b7008ff3be8ec477c901b2ceca4b16b
ffmpeg/libavcodec/qsvdec.h
Michael Niedermayer 0a731e4596 Merge commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2' 
* commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2':
  lavc: add Intel libmfx-based H.264 encoder

Conflicts:
	Changelog
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-28 01:33:27 +01:00

1.8 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink