Peter Korsgaard 7353967690 Merge branch 'next' ... Quite some conflicts, so here goes .. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>		2016-09-02 16:20:33 +02:00
..
0013-bfin-disable-optimization.patch	ffmpeg: fix bfin build	2016-08-22 17:20:18 +02:00
Config.in	Merge branch 'next'	2016-09-02 16:20:33 +02:00
ffmpeg.hash	package/ffmpeg: bump version to 3.1.3	2016-08-27 14:41:44 +02:00
ffmpeg.mk	Merge branch 'next'	2016-09-02 16:20:33 +02:00