Move conditional libav defines and includes