Build system fixes...
Merge branch 'master' into smart_chunkisation_merged
Conflicts: Cutter/input-avs.c Cutter/main.c
Make the chunk type selectable at runtime
added x264 support link support in Makefiles through the X264DIR variable
only needed if ffmpeg was compiled with x264 support
added program to remove chunks from a file