eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-05 21:55:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
96ee6b9962ec0479deddedd64a46aef4846d90ba
ffmpeg/libavcodec/allcodecs.c
Michael Niedermayer 96ee6b9962 Merge commit '3a85397e8bb477eb34678d9edc52893f57003226' 
* commit '3a85397e8bb477eb34678d9edc52893f57003226':
  lavc: add Intel libmfx-based MPEG2 encoder

Conflicts:
	Changelog
	configure
	libavcodec/allcodecs.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-09 11:17:12 +02:00

29 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink