This reverts commit b003138081 because it breaks Nixpkgs evaluation with "error: attribute `cross.config' missing". http://hydra.nixos.org/build/5725600
b003138081
Also leaving 0_8 branch, as it's compatible with older ffmpeg versions. I'm planning that all expressions will be able to switch easily between ffmpeg and libav (whatever default we choose, but I prefer libav).
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
svn path=/nixpkgs/trunk/; revision=27797