Adding x264 and fdk aac
Merge pull request #2 from petergoldstein/feature/add_x264_and_fdk_aac

Adding x264 and fdk aac