(of course, it was obvious reverting the earlier fix would break it,
 but some people don't seem to care about the build system as long as
 "their" feature works).
Oh, and don't let version.c twice in CLEANFILES.

* modules/codec/x264.c: Fix range enforcement and string selection (deprecated was in the way). Use actual default values for options direct, me and deblock filter params (mainly for the gui).

That atom is not defined at http://www.freedesktop.org/wiki/Standards_2fwm_2dspec, and is not used by metacity, or xfwm4 for example

- cleanup

Yeah, we are stupid because we manage to make the perfect WxWidgets toolkit
fail. Go figure. I suspect the WxWidget live in another planet or something.

What the heck? can't you pay attention to SVN warnings about CONFLICTS?
Thanks for introducing a memory leak on top of that.

(Hint: reading errno multiple times is incorrect)

Thanks to Ed Schouten for noticing.