2 Commits

Author	SHA1	Message	Date
Fredrik Fornwall	47b2c44e06	ffmpeg: Mark as conflicting with libav	2015-12-13 15:06:51 -05:00
Fredrik Fornwall	351bc9dbb2	Add ffmpeg as a disabled package	2015-12-10 06:57:56 -05:00