3
0
Fork 0
forked from mirrors/nixpkgs

mplayer2: use default/latest ffmpeg

This commit is contained in:
Mathijs Kwik 2013-12-23 10:51:15 +01:00
parent 70f3d42729
commit f7500f9571

View file

@ -8518,9 +8518,7 @@ let
pulseSupport = config.pulseaudio or false; pulseSupport = config.pulseaudio or false;
}; };
mplayer2 = callPackage ../applications/video/mplayer2 { mplayer2 = callPackage ../applications/video/mplayer2 { };
ffmpeg = ffmpeg_1;
};
MPlayerPlugin = browser: MPlayerPlugin = browser:
import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in { import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in {