Jonathan Ringer 6b15fdce86 Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/shells/ion/default.nix pkgs/tools/misc/cicero-tui/default.nix		2021-05-20 22:11:42 -07:00
..
atomicparsley
bento4
dvgrab
gopro	gopro: use ffmpeg instead of ffmpeg_3	2021-05-20 12:05:35 -07:00
harvid
mjpegtools
play-with-mpv
rav1e	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-16 18:27:14 -07:00
rtmpdump
svt-av1
swfmill
swftools	libungif: remove in favour of giflib	2021-04-16 14:06:10 +00:00
untrunc-anthwlock
vcsi
vnc2flv
vncrec
xjadeo
yamdi